From 2ab8face77a9982f741b02f5d6d68e6f89c827d7 Mon Sep 17 00:00:00 2001
From: Carlos Barria <cbarria@yahoo.com>
Date: Tue, 14 May 2024 20:32:43 -0400
Subject: [PATCH] (site/ls) bump rke to 1.5.8

---
 hieradata/site/ls/role/rke.yaml                               | 1 +
 spec/hosts/nodes/chango01.ls.lsst.org_spec.rb                 | 2 +-
 spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb                    | 4 ++--
 ...nkong01.lsst.org_spec.rb => konkong01.ls.lsst.org_spec.rb} | 4 ++--
 spec/hosts/nodes/luan01.ls.lsst.org_spec.rb                   | 4 ++--
 spec/hosts/nodes/manke01.ls.lsst.org_spec.rb                  | 4 ++--
 spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb                | 3 ++-
 spec/hosts/roles/rke_spec.rb                                  | 2 +-
 8 files changed, 13 insertions(+), 11 deletions(-)
 rename spec/hosts/nodes/{konkong01.lsst.org_spec.rb => konkong01.ls.lsst.org_spec.rb} (96%)

diff --git a/hieradata/site/ls/role/rke.yaml b/hieradata/site/ls/role/rke.yaml
index 7a7caa081f..6c241ed3ad 100644
--- 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.8"
diff --git a/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb b/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb
index 0c6d52a11c..55989a230e 100644
--- 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.4.6',
+          version: '1.5.8',
         )
       end
 
diff --git a/spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb b/spec/hosts/nodes/gaw01.ls.lsst.org_spec.rb
index d7c9378363..06bcaf5e7e 100644
--- 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.4.6',
-          checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+          version: '1.5.8',
+          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
         )
       end
 
diff --git a/spec/hosts/nodes/konkong01.lsst.org_spec.rb b/spec/hosts/nodes/konkong01.ls.lsst.org_spec.rb
similarity index 96%
rename from spec/hosts/nodes/konkong01.lsst.org_spec.rb
rename to spec/hosts/nodes/konkong01.ls.lsst.org_spec.rb
index e42261bef1..409d2dfcb7 100644
--- a/spec/hosts/nodes/konkong01.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.4.6',
-          checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+          version: '1.5.8',
+          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
         )
       end
 
diff --git a/spec/hosts/nodes/luan01.ls.lsst.org_spec.rb b/spec/hosts/nodes/luan01.ls.lsst.org_spec.rb
index b38fa614ae..9bd67a21be 100644
--- 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.4.6',
-          checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+          version: '1.5.8',
+          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
         )
       end
 
diff --git a/spec/hosts/nodes/manke01.ls.lsst.org_spec.rb b/spec/hosts/nodes/manke01.ls.lsst.org_spec.rb
index 7dd911f0ee..3c719c5e53 100644
--- 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.4.6',
-          checksum: '12d8fee6f759eac64b3981ef2822353993328f2f839ac88b3739bfec0b9d818c',
+          version: '1.5.8',
+          checksum: 'f691a33b59db48485e819d89773f2d634e347e9197f4bb6b03270b192bd9786d',
         )
       end
 
diff --git a/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb
index 613155f545..987cde4d21 100644
--- a/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb
+++ b/spec/hosts/nodes/rancher01.ls.lsst.org_spec.rb
@@ -32,7 +32,8 @@
 
       it do
         is_expected.to contain_class('profile::core::rke').with(
-          version: '1.4.6',
+          version: '1.5.8',
+          
         )
       end
 
diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb
index 7b0bec6522..3d426f0dac 100644
--- a/spec/hosts/roles/rke_spec.rb
+++ b/spec/hosts/roles/rke_spec.rb
@@ -35,7 +35,7 @@
     )
   end
 
-  if (site == 'dev') || (site == 'tu')
+  if (site == 'dev') || (site == 'tu') || (site == 'ls')
     it do
       is_expected.to contain_class('rke').with(
         version: '1.5.8',