(CAT-2193): Fixed kubernetes environment setup for Debian. This allow…

…s spec tests to run successfully for debian platform
puppetlabs · Jan 9, 2025 · f2a4a65 · f2a4a65
1 parent 689d78b
commit f2a4a65
Show file tree

Hide file tree

Showing 6 changed files with 199 additions and 89 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix: {'platform':['rhel-8'],'collection':['puppet7-nightly', 'puppet8-nightly']}
+      matrix: {'platform':['rhel-8', 'debian-11'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
     - name: Checkout Source

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix: {'platform':['rhel-8'],'collection':['puppet7-nightly', 'puppet8-nightly']}
+      matrix: {'platform':['rhel-8', 'debian-11'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
     - name: Checkout Source

diff --git a/manifests/repos.pp b/manifests/repos.pp
@@ -64,12 +64,13 @@
       'Debian': {
         $codename = fact('os.distro.codename')
         apt::source { 'kubernetes':
-          location => pick($kubernetes_apt_location, 'https://apt.kubernetes.io'),
-          repos    => pick($kubernetes_apt_repos, 'main'),
-          release  => pick($kubernetes_apt_release, 'kubernetes-xenial'),
+          location => pick($kubernetes_apt_location, 'https://pkgs.k8s.io/core:/stable:/v1.32/deb/'),
+          repos    => pick($kubernetes_apt_repos, ' '),
+          release  => pick($kubernetes_apt_release, ' /'),
+          comment  => 'Kubernetes',
           key      => {
-            'id'     => pick($kubernetes_key_id, 'A362B822F6DEDC652817EA46B53DC80D13EDEF05'),
-            'source' => pick($kubernetes_key_source, 'https://packages.cloud.google.com/apt/doc/apt-key.gpg'),
+            'name'   => 'kubernetes-apt-keyring.gpg',
+            'source' => pick($kubernetes_key_source, 'https://pkgs.k8s.io/core:/stable:/v1.32/deb/Release.key'),
           },
         }
 
@@ -78,7 +79,7 @@
           apt::source { 'docker':
             location => pick($docker_apt_location, 'https://download.docker.com/linux/ubuntu/'),
             repos    => pick($docker_apt_repos, 'stable'),
-            release  => pick($docker_apt_release,$codename),
+            release  => pick($docker_apt_release, $codename),
             key      => {
               'id'     => pick($docker_key_id, '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'),
               'source' => pick($docker_key_source, 'https://download.docker.com/linux/ubuntu/gpg'),
@@ -99,8 +100,8 @@
 
         yumrepo { 'kubernetes':
           descr    => 'Kubernetes',
-          baseurl  => pick($kubernetes_yum_baseurl, 'https://pkgs.k8s.io/core:/stable:/v1.28/rpm/'),
-          gpgkey   => pick($kubernetes_yum_gpgkey, 'https://pkgs.k8s.io/core:/stable:/v1.28/rpm/repodata/repomd.xml.key'),
+          baseurl  => pick($kubernetes_yum_baseurl, 'https://pkgs.k8s.io/core:/stable:/v1.32/rpm/'),
+          gpgkey   => pick($kubernetes_yum_gpgkey, 'https://pkgs.k8s.io/core:/stable:/v1.32/rpm/repodata/repomd.xml.key'),
           gpgcheck => true,
         }
       }

diff --git a/spec/acceptance/kubernetes_spec.rb b/spec/acceptance/kubernetes_spec.rb
@@ -18,6 +18,8 @@
             class {'kubernetes':
               kubernetes_version => '1.28.15',
               kubernetes_package_version => '1.28.15',
+              kubernetes_yum_baseurl => 'https://pkgs.k8s.io/core:/stable:/v1.28/rpm/',
+              kubernetes_yum_gpgkey => 'https://pkgs.k8s.io/core:/stable:/v1.28/rpm/repodata/repomd.xml.key',
               controller_address => "#{int_ipaddr1}:6443",
               container_runtime => 'docker',
               manage_docker => false,
@@ -30,12 +32,18 @@ class {'kubernetes':
             }
           }
           /^(Debian|Ubuntu)$/: {
-          class {'kubernetes':
-                  controller => true,
-                  schedule_on_controller => true,
-                  environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
-                  ignore_preflight_errors => ['NumCPU'],
-                }
+            class {'kubernetes':
+              kubernetes_version => '1.28.15',
+              kubernetes_package_version => '1.28.15-1.1',
+              kubernetes_apt_location => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/',
+              kubernetes_apt_repos => ' ',
+              kubernetes_apt_release => ' /',
+              kubernetes_key_source => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key',
+              controller => true,
+              schedule_on_controller => true,
+              environment  => ['HOME=/root', 'KUBECONFIG=/etc/kubernetes/admin.conf'],
+              ignore_preflight_errors => ['NumCPU','ExternalEtcdVersion'],
+            }
           }
           default:  {
             class {'kubernetes': } # any other OS are not supported

diff --git a/spec/classes/repos_spec.rb b/spec/classes/repos_spec.rb
@@ -22,11 +22,11 @@
     let(:params) do
       {
         'container_runtime' => 'docker',
-        'kubernetes_apt_location' => 'http://apt.kubernetes.io',
-        'kubernetes_apt_release' => 'kubernetes-xenial',
-        'kubernetes_apt_repos' => 'main',
+        'kubernetes_apt_location' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/',
+        'kubernetes_apt_release' => ' /',
+        'kubernetes_apt_repos' => ' ',
         'kubernetes_key_id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
-        'kubernetes_key_source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
+        'kubernetes_key_source' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key',
         'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
         'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
         'docker_apt_location' => 'https://download.docker.com/linux/ubuntu',
@@ -45,10 +45,10 @@
     it {
       expect(subject).to contain_apt__source('kubernetes').with(
         ensure: 'present',
-        location: 'http://apt.kubernetes.io',
-        repos: 'main',
-        release: 'kubernetes-xenial',
-        key: { 'id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB', 'source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' },
+        location: 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/',
+        repos: ' ',
+        release: ' /',
+        key: { 'name' => 'kubernetes-apt-keyring.gpg', 'source' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key' },
       )
     }
 
@@ -83,11 +83,11 @@
     let(:params) do
       {
         'container_runtime' => 'cri_containerd',
-        'kubernetes_apt_location' => 'http://apt.kubernetes.io',
-        'kubernetes_apt_release' => 'kubernetes-xenial',
-        'kubernetes_apt_repos' => 'main',
+        'kubernetes_apt_location' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/',
+        'kubernetes_apt_release' => ' /',
+        'kubernetes_apt_repos' => ' ',
         'kubernetes_key_id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
-        'kubernetes_key_source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
+        'kubernetes_key_source' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key',
         'kubernetes_yum_baseurl' => 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
         'kubernetes_yum_gpgkey' => 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
         'docker_apt_location' => 'https://download.docker.com/linux/ubuntu',
@@ -106,10 +106,10 @@
     it {
       expect(subject).to contain_apt__source('kubernetes').with(
         ensure: 'present',
-        location: 'http://apt.kubernetes.io',
-        repos: 'main',
-        release: 'kubernetes-xenial',
-        key: { 'id' => '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB', 'source' => 'https://packages.cloud.google.com/apt/doc/apt-key.gpg' },
+        location: 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/',
+        repos: ' ',
+        release: ' /',
+        key: { 'name' => 'kubernetes-apt-keyring.gpg', 'source' => 'https://pkgs.k8s.io/core:/stable:/v1.28/deb/Release.key' },
       )
     }