Merge pull request #1736 from lsst-it/IT-6114_bump_rke2_cp

dtapiacl · web-flow · commit 96a8becab3d2 · 2025-05-06T13:39:17.000-04:00
(role/rke/rke2) bump CP rke client v1.7.6 and rke2 k8s v1.31.7
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
@@ -579,8 +579,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.30"
-rke2::version: "1.30.7~rke2r1"
+rke2::release_series: "1.31"
+rke2::version: "1.31.7~rke2r1"
 rke2::versionlock: true
 rke2::config:
   server: "https://%{::cluster}.%{::site}.lsst.org:9345"
diff --git a/hieradata/site/dev/role/rke2agent.yaml b/hieradata/site/dev/role/rke2agent.yaml
diff --git a/hieradata/site/dev/role/rke2server.yaml b/hieradata/site/dev/role/rke2server.yaml
diff --git a/hieradata/site/ls/role/rke.yaml b/hieradata/site/ls/role/rke.yaml
diff --git a/hieradata/site/ls/role/rke2agent.yaml b/hieradata/site/ls/role/rke2agent.yaml
diff --git a/hieradata/site/ls/role/rke2server.yaml b/hieradata/site/ls/role/rke2server.yaml
diff --git a/hieradata/site/tu/role/rke2agent.yaml b/hieradata/site/tu/role/rke2agent.yaml
diff --git a/hieradata/site/tu/role/rke2server.yaml b/hieradata/site/tu/role/rke2server.yaml
diff --git a/site/profile/manifests/core/rke.pp b/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.5',
+  String                         $version       = '1.7.6',
 ) {
   include kmod
   require ipa
diff --git a/spec/classes/core/rke_spec.rb b/spec/classes/core/rke_spec.rb
@@ -26,8 +26,8 @@
 
         it do
           is_expected.to contain_class('rke').with(
-            version: '1.6.5',
-            checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+            version: '1.7.6',
+            checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
           )
         end
       end
diff --git a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb b/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.30',
-          version: '1.30.7~rke2r1'
+          release_series: '1.31',
+          version: '1.31.7~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb b/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.30',
-          version: '1.30.7~rke2r1'
+          release_series: '1.31',
+          version: '1.31.7~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb
@@ -52,7 +52,7 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.5'
+          version: '1.7.6'
         )
       end
 
diff --git a/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb
@@ -53,7 +53,7 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.6.5'
+          version: '1.7.6'
         )
       end
 
diff --git a/spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb b/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.5',
-          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+          version: '1.7.6',
+          checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
         )
       end
 
diff --git a/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb
diff --git a/spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb b/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.5',
-          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+          version: '1.7.6',
+          checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
         )
       end
 
diff --git a/spec/hosts/nodes/rancher01.tu.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.tu.lsst.org_spec.rb
@@ -31,7 +31,7 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.6.5'
+          version: '1.7.6'
         )
       end
 
diff --git a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb
@@ -57,8 +57,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
-          release_series: '1.30',
-          version: '1.30.7~rke2r1'
+          release_series: '1.31',
+          version: '1.31.7~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb
@@ -57,8 +57,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'agent',
-          release_series: '1.30',
-          version: '1.30.7~rke2r1'
+          release_series: '1.31',
+          version: '1.31.7~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb b/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.5',
-          checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+          version: '1.7.6',
+          checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
         )
       end
 
diff --git a/spec/hosts/roles/rke2agent_spec.rb b/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.31',
-        version: '1.31.7~rke2r1',
-        versionlock: true
-      )
-    end
-  else
-    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 do
+    is_expected.to contain_class('rke2').with(
+      node_type: 'agent',
+      release_series: '1.31',
+      version: '1.31.7~rke2r1',
+      versionlock: true
+    )
   end
 
   it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }
diff --git a/spec/hosts/roles/rke2server_spec.rb b/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.31',
-        version: '1.31.7~rke2r1',
-        versionlock: true
-      )
-    end
-  else
-    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 do
+    is_expected.to contain_class('rke2').with(
+      node_type: 'server',
+      release_series: '1.31',
+      version: '1.31.7~rke2r1',
+      versionlock: true
+    )
   end
 
   it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }
diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb
@@ -43,21 +43,11 @@
     )
   end
 
-  case site
-  when 'ls'
-    it do
-      is_expected.to contain_class('rke').with(
-        version: '1.7.6',
-        checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
-      )
-    end
-  else
-    it do
-      is_expected.to contain_class('rke').with(
-        version: '1.6.5',
-        checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
-      )
-    end
+  it do
+    is_expected.to contain_class('rke').with(
+      version: '1.7.6',
+      checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
+    )
   end
 
   it do

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`class profile::core::rke (`
`11`	`11`	`Optional[Sensitive[String[1]]] $keytab_base64 = undef,`
`12`		`- String $version = '1.6.5',`
	`12`	`+ String $version = '1.7.6',`
`13`	`13`	`) {`
`14`	`14`	`include kmod`
`15`	`15`	`require ipa`