Merge pull request #1963 from lsst-it/IT-6559-rke2-1_32_9

badenerb · web-flow · commit 9bfbf67b897d · 2025-11-04T10:24:25.000-03:00
(rke2) bump dev rke2 k8s 1.32.9~rke2r1
diff --git a/hieradata/site/dev/role/rke2agent.yaml b/hieradata/site/dev/role/rke2agent.yaml
@@ -0,0 +1,3 @@
+---
+rke2::release_series: "1.32"
+rke2::version: "1.32.9~rke2r1"
diff --git a/hieradata/site/dev/role/rke2server.yaml b/hieradata/site/dev/role/rke2server.yaml
@@ -0,0 +1,3 @@
+---
+rke2::release_series: "1.32"
+rke2::version: "1.32.9~rke2r1"
diff --git a/spec/hosts/nodes/ayekan01.dev.lsst.org_spec.rb b/spec/hosts/nodes/ayekan01.dev.lsst.org_spec.rb
@@ -57,7 +57,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/kona01.dev.lsst.org_spec.rb b/spec/hosts/nodes/kona01.dev.lsst.org_spec.rb
@@ -55,7 +55,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/pukem01.dev.lsst.org_spec.rb b/spec/hosts/nodes/pukem01.dev.lsst.org_spec.rb
@@ -55,7 +55,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/pukem04.dev.lsst.org_spec.rb b/spec/hosts/nodes/pukem04.dev.lsst.org_spec.rb
@@ -55,7 +55,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'agent',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb
@@ -31,7 +31,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb b/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb
@@ -63,7 +63,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/ruka04.dev.lsst.org_spec.rb b/spec/hosts/nodes/ruka04.dev.lsst.org_spec.rb
@@ -64,7 +64,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/nodes/ruka07.dev.lsst.org_spec.rb b/spec/hosts/nodes/ruka07.dev.lsst.org_spec.rb
@@ -73,7 +73,7 @@
         is_expected.to contain_class('rke2').with(
           node_type: 'agent',
           release_series: '1.32',
-          version: '1.32.2~rke2r1'
+          version: '1.32.9~rke2r1'
         )
       end
 
diff --git a/spec/hosts/roles/rke2agent_spec.rb b/spec/hosts/roles/rke2agent_spec.rb
@@ -8,13 +8,25 @@
   include_examples 'k8snode profile'
   include_examples 'restic common'
 
-  it do
-    is_expected.to contain_class('rke2').with(
-      node_type: 'agent',
-      release_series: '1.32',
-      version: '1.32.2~rke2r1',
-      versionlock: true
-    )
+  case site
+  when 'dev'
+    it do
+      is_expected.to contain_class('rke2').with(
+        node_type: 'agent',
+        release_series: '1.32',
+        version: '1.32.9~rke2r1',
+        versionlock: true
+      )
+    end
+  else
+    it do
+      is_expected.to contain_class('rke2').with(
+        node_type: 'agent',
+        release_series: '1.32',
+        version: '1.32.2~rke2r1',
+        versionlock: true
+      )
+    end
   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,13 +8,25 @@
   include_examples 'k8snode profile'
   include_examples 'restic common'
 
-  it do
-    is_expected.to contain_class('rke2').with(
-      node_type: 'server',
-      release_series: '1.32',
-      version: '1.32.2~rke2r1',
-      versionlock: true
-    )
+  case site
+  when 'dev'
+    it do
+      is_expected.to contain_class('rke2').with(
+        node_type: 'server',
+        release_series: '1.32',
+        version: '1.32.9~rke2r1',
+        versionlock: true
+      )
+    end
+  else
+    it do
+      is_expected.to contain_class('rke2').with(
+        node_type: 'server',
+        release_series: '1.32',
+        version: '1.32.2~rke2r1',
+        versionlock: true
+      )
+    end
   end
 
   it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+rke2::release_series: "1.32"`
	`3`	`+rke2::version: "1.32.9~rke2r1"`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`is_expected.to contain_class('rke2').with(`
`58`	`58`	`node_type: 'server',`
`59`	`59`	`release_series: '1.32',`
`60`		`- version: '1.32.2~rke2r1'`
	`60`	`+ version: '1.32.9~rke2r1'`
`61`	`61`	`)`
`62`	`62`	`end`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`is_expected.to contain_class('rke2').with(`
`56`	`56`	`node_type: 'server',`
`57`	`57`	`release_series: '1.32',`
`58`		`- version: '1.32.2~rke2r1'`
	`58`	`+ version: '1.32.9~rke2r1'`
`59`	`59`	`)`
`60`	`60`	`end`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`is_expected.to contain_class('rke2').with(`
`32`	`32`	`node_type: 'server',`
`33`	`33`	`release_series: '1.32',`
`34`		`- version: '1.32.2~rke2r1'`
	`34`	`+ version: '1.32.9~rke2r1'`
`35`	`35`	`)`
`36`	`36`	`end`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@`
`63`	`63`	`is_expected.to contain_class('rke2').with(`
`64`	`64`	`node_type: 'server',`
`65`	`65`	`release_series: '1.32',`
`66`		`- version: '1.32.2~rke2r1'`
	`66`	`+ version: '1.32.9~rke2r1'`
`67`	`67`	`)`
`68`	`68`	`end`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`is_expected.to contain_class('rke2').with(`
`65`	`65`	`node_type: 'server',`
`66`	`66`	`release_series: '1.32',`
`67`		`- version: '1.32.2~rke2r1'`
	`67`	`+ version: '1.32.9~rke2r1'`
`68`	`68`	`)`
`69`	`69`	`end`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`is_expected.to contain_class('rke2').with(`
`74`	`74`	`node_type: 'agent',`
`75`	`75`	`release_series: '1.32',`
`76`		`- version: '1.32.2~rke2r1'`
	`76`	`+ version: '1.32.9~rke2r1'`
`77`	`77`	`)`
`78`	`78`	`end`
`79`	`79`