Merge pull request #1211 from lsst-it/IT-5439_rke_bump_ls

(role/rke) bump LS client to v1.5.9
lsst-it · Jun 11, 2024 · 9a7f43e · 9a7f43e
2 parents 3ee8b8c + 7689969
commit 9a7f43e
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 12 deletions.
diff --git a/hieradata/cluster/antu/role/rke.yaml b/hieradata/cluster/antu/role/rke.yaml
@@ -2,4 +2,3 @@
 classes:
   - "profile::core::sysctl::rp_filter"
 profile::core::sysctl::rp_filter::enable: false
-profile::core::rke::version: "1.5.9"
diff --git a/hieradata/site/ls/role/rke.yaml b/hieradata/site/ls/role/rke.yaml
@@ -1,2 +1,3 @@
 ---
 profile::core::docker::version: "24.0.9"
+profile::core::rke::version: "1.5.9"
diff --git a/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb b/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb
@@ -44,7 +44,7 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.5.8',
+          version: '1.5.9',
         )
       end
 

diff --git a/spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb b/spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb
@@ -48,8 +48,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.5.8',
-          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+          version: '1.5.9',
+          checksum: '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b',
         )
       end
 

diff --git a/spec/hosts/nodes/konkong01.ls.lsst.org_spec.rb b/spec/hosts/nodes/konkong01.ls.lsst.org_spec.rb
@@ -49,8 +49,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.5.8',
-          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+          version: '1.5.9',
+          checksum: '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b',
         )
       end
 

diff --git a/spec/hosts/nodes/luan01.ls.lsst.org_spec.rb b/spec/hosts/nodes/luan01.ls.lsst.org_spec.rb
@@ -48,8 +48,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.5.8',
-          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+          version: '1.5.9',
+          checksum: '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b',
         )
       end
 

diff --git a/spec/hosts/nodes/manke01.ls.lsst.org_spec.rb b/spec/hosts/nodes/manke01.ls.lsst.org_spec.rb
@@ -49,8 +49,8 @@
 
       it do
         is_expected.to contain_class('rke').with(
-          version: '1.5.8',
-          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
+          version: '1.5.9',
+          checksum: '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b',
         )
       end
 

diff --git a/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb
@@ -32,7 +32,7 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.5.8',
+          version: '1.5.9',
         )
       end
 

diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb
@@ -35,7 +35,8 @@
     )
   end
 
-  if (site == 'dev') || (site == 'tu')
+  case site
+  when 'dev', 'tu', 'ls'
     it do
       is_expected.to contain_class('rke').with(
         version: '1.5.9',
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ @@
           it do
             is_expected.to contain_class('profile::core::rke').with(
-              version: '1.5.8',
+              version: '1.5.9',
             )
           end
@@ Expand Down @@