diff --git a/hieradata/cluster/antu/role/rke.yaml b/hieradata/cluster/antu/role/rke.yaml index b6341368a7..275dc16ae8 100644 --- 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 index 7a7caa081f..7667bbe140 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.9" diff --git a/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb b/spec/hosts/nodes/chango01.ls.lsst.org_spec.rb index 55989a230e..54b7f4f31b 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.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 index 06bcaf5e7e..8f6470f0b3 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.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 index 409d2dfcb7..4fd2217d68 100644 --- 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 index 9bd67a21be..0a0c7a81bd 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.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 index 3c719c5e53..e0fdd4e830 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.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 index 2ee230be51..a72e91238d 100644 --- 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 index 287642aea5..3d3397ea3b 100644 --- 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',