Merge pull request #1127 from lsst-it/IT-5132/rke-1.5.8

(site/dev) bump rke to 1.5.8

hieradata/site/dev/role/rke.yaml

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

site/profile/manifests/core/rke.pp

@@ -48,6 +48,7 @@
   $rke_checksum = $version ? {
     '1.3.12'    => '579da2206aec09cadccd8d6f4818861e78a256b6ae550a229335e500a472bd50',
     '1.4.6'     => '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+    '1.5.8'     => 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
     default  => undef,
   }
   unless ($rke_checksum) {

spec/classes/core/rke_spec.rb

@@ -141,6 +141,25 @@
           end
         end
 
+        context 'when 1.5.8' do
+          let(:params) do
+            {
+              version: '1.5.8',
+            }
+          end
+
+          it { is_expected.to compile.with_all_deps }
+
+          include_examples 'rke profile'
+
+          it do
+            is_expected.to contain_class('rke').with(
+              version: '1.5.8',
+              checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+            )
+          end
+        end
+
         context 'when 42' do
           let(:params) do
             {

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

@@ -21,7 +21,7 @@
       let(:node_params) do
         {
           role: 'rke',
-          site: 'ls',
+          site: 'dev',
           cluster: 'ayekan',
         }
       end
@@ -49,8 +49,7 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.4.6',
-          checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+          version: '1.5.8',
         )
       end
 

spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb

@@ -48,9 +48,8 @@
       end
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          enable_dhcp: true,
-          version: '1.4.6',
+        is_expected.to contain_class('rke').with(
+          version: '1.5.8',
         )
       end
 
@@ -62,6 +61,8 @@
         )
       end
 
+      it { is_expected.to contain_class('cni::plugins::dhcp') }
+
       it { is_expected.to contain_class('profile::core::ospl').with_enable_rundir(true) }
 
       it { is_expected.to have_nm__connection_resource_count(6) }

spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb

@@ -48,8 +48,8 @@
       end
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          version: '1.4.6',
+        is_expected.to contain_class('rke').with(
+          version: '1.5.8',
         )
       end
 

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

@@ -31,8 +31,8 @@
       include_examples 'docker', docker_version: '24.0.9'
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          version: '1.4.6',
+        is_expected.to contain_class('rke').with(
+          version: '1.5.8',
         )
       end
 

spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb

@@ -53,9 +53,8 @@
       end
 
       it do
-        is_expected.to contain_class('profile::core::rke').with(
-          enable_dhcp: true,
-          version: '1.4.6',
+        is_expected.to contain_class('rke').with(
+          version: '1.5.8',
         )
       end
 
@@ -67,6 +66,8 @@
         )
       end
 
+      it { is_expected.to contain_class('cni::plugins::dhcp') }
+
       include_context 'with nm interface'
 
       it { is_expected.to have_nm__connection_resource_count(6) }

spec/hosts/roles/rke_spec.rb

@@ -35,11 +35,20 @@
     )
   end
 
-  it do
-    is_expected.to contain_class('rke').with(
-      version: '1.4.6',
-      checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
-    )
+  if site == 'dev'
+    it do
+      is_expected.to contain_class('rke').with(
+        version: '1.5.8',
+        checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+      )
+    end
+  else
+    it do
+      is_expected.to contain_class('rke').with(
+        version: '1.4.6',
+        checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+      )
+    end
   end
 end