Merge pull request #1198 from lsst-it/IT-5422_rke_bump_tu

cbarria · web-flow · commit 0961f29b29f7 · 2024-06-04T11:27:58.000-04:00
(role/rke) bump TU client to v1.5.9
diff --git a/hieradata/site/tu/role/rke.yaml b/hieradata/site/tu/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/pillan01.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan01.tu.lsst.org_spec.rb
@@ -39,7 +39,7 @@
       it do
         is_expected.to contain_class('profile::core::rke').with(
           enable_dhcp: true,
-          version: '1.5.8',
+          version: '1.5.9',
         )
       end
 
diff --git a/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb b/spec/hosts/nodes/pillan08.tu.lsst.org_spec.rb
@@ -42,7 +42,7 @@
       it do
         is_expected.to contain_class('profile::core::rke').with(
           enable_dhcp: true,
-          version: '1.5.8',
+          version: '1.5.9',
         )
       end
 
diff --git a/spec/hosts/nodes/rancher01.tu.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.tu.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,7 @@
     )
   end
 
-  if site == 'dev'
+  if (site == 'dev') || (site == 'tu')
     it do
       is_expected.to contain_class('rke').with(
         version: '1.5.9',

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`it do`
`40`	`40`	`is_expected.to contain_class('profile::core::rke').with(`
`41`	`41`	`enable_dhcp: true,`
`42`		`- version: '1.5.8',`
	`42`	`+ version: '1.5.9',`
`43`	`43`	`)`
`44`	`44`	`end`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`it do`
`43`	`43`	`is_expected.to contain_class('profile::core::rke').with(`
`44`	`44`	`enable_dhcp: true,`
`45`		`- version: '1.5.8',`
	`45`	`+ version: '1.5.9',`
`46`	`46`	`)`
`47`	`47`	`end`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`
`33`	`33`	`it do`
`34`	`34`	`is_expected.to contain_class('profile::core::rke').with(`
`35`		`- version: '1.5.8',`
	`35`	`+ version: '1.5.9',`
`36`	`36`	`)`
`37`	`37`	`end`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`)`
`36`	`36`	`end`
`37`	`37`
`38`		`- if site == 'dev'`
	`38`	`+ if (site == 'dev') \|\| (site == 'tu')`
`39`	`39`	`it do`
`40`	`40`	`is_expected.to contain_class('rke').with(`
`41`	`41`	`version: '1.5.9',`