Merge pull request #1900 from lsst-it/IT-6482_ls_os_k8s_updates

(role/rke/rke2) bump LS client to v1.8.0 / rke2 k8s 1.32.2~rke2r1

Author: dtapiacl

hieradata/site/ls/role/rke.yaml

@@ -0,0 +1,2 @@
+---
+profile::core::rke::version: "1.8.0"

hieradata/site/ls/role/rke2agent.yaml

@@ -0,0 +1,3 @@
+---
+rke2::release_series: "1.32"
+rke2::version: "1.32.2~rke2r1"

hieradata/site/ls/role/rke2server.yaml

@@ -0,0 +1,3 @@
+---
+rke2::release_series: "1.32"
+rke2::version: "1.32.2~rke2r1"

site/profile/manifests/core/rke.pp

@@ -37,10 +37,10 @@
   }
 
   $rke_checksum = $version ? {
-    '1.6.5'      => '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7',
     '1.7.6'      => 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9',
     '1.7.7'      => '4317d54ed5251d71c82b631083907c526dc74808941deebc392369108b7a4b10',
     '1.7.8'      => '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde',
+    '1.8.0'      => '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25',
     default  => undef,
   }
   unless ($rke_checksum) {

spec/classes/core/rke_spec.rb

@@ -68,10 +68,10 @@
       end
 
       context 'with version param' do
-        context 'when 1.6.5' do
+        context 'when 1.7.6' do
           let(:params) do
             {
-              version: '1.6.5',
+              version: '1.7.6',
             }
           end
 
@@ -81,16 +81,16 @@
 
           it do
             is_expected.to contain_class('rke').with(
-              version: '1.6.5',
-              checksum: '80694373496abd5033cb97c2512f2c36c933d301179881e1d28bf7b78efab3e7'
+              version: '1.7.6',
+              checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
             )
           end
         end
 
-        context 'when 1.7.6' do
+        context 'when 1.7.7' do
           let(:params) do
             {
-              version: '1.7.6',
+              version: '1.7.7',
             }
           end
 
@@ -100,16 +100,16 @@
 
           it do
             is_expected.to contain_class('rke').with(
-              version: '1.7.6',
-              checksum: 'a6ef89ac3042e066b0596cb38d5bff0192b84a7d4b6ed5b14cddc4bcfd5c9cd9'
+              version: '1.7.7',
+              checksum: '4317d54ed5251d71c82b631083907c526dc74808941deebc392369108b7a4b10'
             )
           end
         end
 
-        context 'when 1.7.8' do
+        context 'when 1.8.0' do
           let(:params) do
             {
-              version: '1.7.8',
+              version: '1.8.0',
             }
           end
 
@@ -119,8 +119,8 @@
 
           it do
             is_expected.to contain_class('rke').with(
-              version: '1.7.8',
-              checksum: '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde'
+              version: '1.8.0',
+              checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25'
             )
           end
         end

spec/hosts/nodes/antu01.ls.lsst.org_spec.rb

@@ -50,7 +50,7 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.7.8'
+          version: '1.8.0'
         )
       end
 

spec/hosts/nodes/chango01.ls.lsst.org_spec.rb

@@ -43,7 +43,7 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.7.8'
+          version: '1.8.0'
         )
       end
 

spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb

@@ -54,8 +54,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
-          release_series: '1.31',
-          version: '1.31.9~rke2r1'
+          release_series: '1.32',
+          version: '1.32.2~rke2r1'
         )
       end
 

spec/hosts/nodes/gaw04.ls.lsst.org_spec.rb

@@ -54,8 +54,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'agent',
-          release_series: '1.31',
-          version: '1.31.9~rke2r1'
+          release_series: '1.32',
+          version: '1.32.2~rke2r1'
         )
       end
 

spec/hosts/nodes/konkong01.ls.lsst.org_spec.rb

@@ -55,8 +55,8 @@
       it do
         is_expected.to contain_class('rke2').with(
           node_type: 'server',
-          release_series: '1.31',
-          version: '1.31.9~rke2r1'
+          release_series: '1.32',
+          version: '1.32.2~rke2r1'
         )
       end