Merge pull request #1620 from lsst-it/IT-5867_rke_bump_cp

(role/rke2) bump CP rke client v1.6.5 and rke2 k8s v1.30.7

hieradata/common.yaml

@@ -577,8 +577,8 @@ s3daemon_default_image: "ghcr.io/lsst-dm/s3daemon:sha-57e1aa9"
 pi::config::reboot: false  # XXX this should be removed when pi role/profile refactoring is complete
 pi::cmdline::reboot: false  # XXX this should be removed when pi role/profile refactoring is complete
 
-rke2::release_series: "1.29"
-rke2::version: "1.29.9~rke2r1"
+rke2::release_series: "1.30"
+rke2::version: "1.30.7~rke2r1"
 rke2::versionlock: true
 rke2::config:
   server: "https://%{::cluster}.%{::site}.lsst.org:9345"

hieradata/site/ls/role/rke.yaml

@@ -1,3 +1,2 @@
 ---
 profile::core::docker::version: "24.0.9"
-profile::core::rke::version: "1.6.5"

hieradata/site/tu/role/rke.yaml

@@ -1,3 +1,2 @@
 ---
 profile::core::docker::version: "24.0.9"
-profile::core::rke::version: "1.6.5"

site/profile/manifests/core/rke.pp

@@ -9,7 +9,7 @@
 #
 class profile::core::rke (
   Optional[Sensitive[String[1]]] $keytab_base64 = undef,
-  String                         $version       = '1.6.2',
+  String                         $version       = '1.6.5',
 ) {
   include kmod
   require ipa

spec/classes/core/rke_spec.rb

@@ -26,8 +26,8 @@
 
         it do
           is_expected.to contain_class('rke').with(
-            version: '1.6.2',
-            checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+            version: '1.6.5',
+            checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
           )
         end
       end

spec/hosts/nodes/chonchon01.cp.lsst.org_spec.rb

@@ -50,8 +50,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/chonchon04.cp.lsst.org_spec.rb

@@ -50,8 +50,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb

@@ -56,8 +56,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
-          release_series: '1.29',
-          version: '1.29.9~rke2r1'
+          release_series: '1.30',
+          version: '1.30.7~rke2r1'
         )
       end
 

spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb

@@ -68,8 +68,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'agent',
-          release_series: '1.29',
-          version: '1.29.9~rke2r1'
+          release_series: '1.30',
+          version: '1.30.7~rke2r1'
         )
       end
 

spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb

@@ -48,8 +48,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb

@@ -31,8 +31,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb

@@ -51,8 +51,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb

@@ -49,8 +49,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb

@@ -48,8 +48,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.2',
-          checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
+          version: '1.6.5',
+          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
         )
       end
 

spec/hosts/roles/rke2agent_spec.rb

@@ -8,25 +8,13 @@
   include_examples 'k8snode profile'
   include_examples 'restic common'
 
-  case site
-  when 'dev', 'tu', 'ls'
-    it do
-      is_expected.to contain_class('rke2').with(
-        node_type: 'agent',
-        release_series: '1.30',
-        version: '1.30.7~rke2r1',
-        versionlock: true
-      )
-    end
-  else
-    it do
-      is_expected.to contain_class('rke2').with(
-        node_type: 'agent',
-        release_series: '1.29',
-        version: '1.29.9~rke2r1',
-        versionlock: true
-      )
-    end
+  it do
+    is_expected.to contain_class('rke2').with(
+      node_type: 'agent',
+      release_series: '1.30',
+      version: '1.30.7~rke2r1',
+      versionlock: true
+    )
   end
 
   it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }

spec/hosts/roles/rke2server_spec.rb

@@ -8,25 +8,13 @@
   include_examples 'k8snode profile'
   include_examples 'restic common'
 
-  case site
-  when 'dev', 'tu', 'ls'
-    it do
-      is_expected.to contain_class('rke2').with(
-        node_type: 'server',
-        release_series: '1.30',
-        version: '1.30.7~rke2r1',
-        versionlock: true
-      )
-    end
-  else
-    it do
-      is_expected.to contain_class('rke2').with(
-        node_type: 'server',
-        release_series: '1.29',
-        version: '1.29.9~rke2r1',
-        versionlock: true
-      )
-    end
+  it do
+    is_expected.to contain_class('rke2').with(
+      node_type: 'server',
+      release_series: '1.30',
+      version: '1.30.7~rke2r1',
+      versionlock: true
+    )
   end
 
   it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }

spec/hosts/roles/rke_spec.rb

@@ -43,21 +43,11 @@
     )
   end
 
-  case site
-  when 'dev', 'tu', 'ls'
-    it do
-      is_expected.to contain_class('rke').with(
-        version: '1.6.5',
-        checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
-      )
-    end
-  else
-    it do
-      is_expected.to contain_class('rke').with(
-        version: '1.6.2',
-        checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7'
-      )
-    end
+  it do
+    is_expected.to contain_class('rke').with(
+      version: '1.6.5',
+      checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+    )
   end
 
   it do