diff --git a/hieradata/common.yaml b/hieradata/common.yaml index b084d41b56..cdbd324157 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -588,8 +588,8 @@ s3nd::env: pi::config::reboot: false # XXX this should be removed when pi role/profile refactoring is complete pi::cmdline::reboot: false # XXX this should be removed when pi role/profile refactoring is complete -rke2::release_series: "1.31" -rke2::version: "1.31.9~rke2r1" +rke2::release_series: "1.32" +rke2::version: "1.32.2~rke2r1" rke2::versionlock: true rke2::config: server: "https://%{::cluster}.%{::site}.lsst.org:9345" diff --git a/hieradata/site/dev/role/rke2agent.yaml b/hieradata/site/dev/role/rke2agent.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/dev/role/rke2agent.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/hieradata/site/dev/role/rke2server.yaml b/hieradata/site/dev/role/rke2server.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/dev/role/rke2server.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/hieradata/site/ls/role/rke.yaml b/hieradata/site/ls/role/rke.yaml deleted file mode 100644 index 1e6311c30d..0000000000 --- a/hieradata/site/ls/role/rke.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -profile::core::rke::version: "1.8.0" diff --git a/hieradata/site/ls/role/rke2agent.yaml b/hieradata/site/ls/role/rke2agent.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/ls/role/rke2agent.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/hieradata/site/ls/role/rke2server.yaml b/hieradata/site/ls/role/rke2server.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/ls/role/rke2server.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/hieradata/site/tu/role/rke2agent.yaml b/hieradata/site/tu/role/rke2agent.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/tu/role/rke2agent.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/hieradata/site/tu/role/rke2server.yaml b/hieradata/site/tu/role/rke2server.yaml deleted file mode 100644 index ad0f3de9b3..0000000000 --- a/hieradata/site/tu/role/rke2server.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -rke2::release_series: "1.32" -rke2::version: "1.32.2~rke2r1" diff --git a/site/profile/manifests/core/rke.pp b/site/profile/manifests/core/rke.pp index a87e2cf3b6..e196205219 100644 --- a/site/profile/manifests/core/rke.pp +++ b/site/profile/manifests/core/rke.pp @@ -9,7 +9,7 @@ # class profile::core::rke ( Optional[Sensitive[String[1]]] $keytab_base64 = undef, - String $version = '1.7.8', + String $version = '1.8.0', ) { include kmod require ipa diff --git a/spec/classes/core/rke_spec.rb b/spec/classes/core/rke_spec.rb index 47abe6436e..34f7eae053 100644 --- a/spec/classes/core/rke_spec.rb +++ b/spec/classes/core/rke_spec.rb @@ -26,8 +26,8 @@ it do is_expected.to contain_class('rke').with( - version: '1.7.8', - checksum: '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde' + version: '1.8.0', + checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25' ) end end diff --git a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb index 731b1bc5b6..30b9aa2ff2 100644 --- a/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/elqui01.cp.lsst.org_spec.rb @@ -56,8 +56,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'server', - release_series: '1.31', - version: '1.31.9~rke2r1' + release_series: '1.32', + version: '1.32.2~rke2r1' ) end diff --git a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb index 4f798161bc..3c5f62fafa 100644 --- a/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/elqui06.cp.lsst.org_spec.rb @@ -68,8 +68,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'agent', - release_series: '1.31', - version: '1.31.9~rke2r1' + release_series: '1.32', + version: '1.32.2~rke2r1' ) end diff --git a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb index 5a4888dbae..55314ce086 100644 --- a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb @@ -52,7 +52,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.7.8' + version: '1.8.0' ) end diff --git a/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb index 259a17679a..db7b6da9f0 100644 --- a/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/kueyen04.dev.lsst.org_spec.rb @@ -53,7 +53,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.7.8' + version: '1.8.0' ) end diff --git a/spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb b/spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb index 449b4ff8b8..4f0b782e40 100644 --- a/spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/lukay01.cp.lsst.org_spec.rb @@ -48,8 +48,8 @@ it do is_expected.to contain_class('rke').with( - version: '1.7.8', - checksum: '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde' + version: '1.8.0', + checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25' ) end diff --git a/spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb index 7d3a27e96c..8c26841cea 100644 --- a/spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/rancher01.cp.lsst.org_spec.rb @@ -30,8 +30,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'server', - release_series: '1.31', - version: '1.31.9~rke2r1' + release_series: '1.32', + version: '1.32.2~rke2r1' ) end diff --git a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb index 26890f526b..09cd73a662 100644 --- a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb @@ -57,8 +57,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'server', - release_series: '1.31', - version: '1.31.9~rke2r1' + release_series: '1.32', + version: '1.32.2~rke2r1' ) end diff --git a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb index b2becfd24f..521acb794f 100644 --- a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb @@ -57,8 +57,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'agent', - release_series: '1.31', - version: '1.31.9~rke2r1' + release_series: '1.32', + version: '1.32.2~rke2r1' ) end diff --git a/spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb b/spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb index 3b3b944b32..38c1cd24a6 100644 --- a/spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb +++ b/spec/hosts/nodes/yepun01.cp.lsst.org_spec.rb @@ -48,8 +48,8 @@ it do is_expected.to contain_class('rke').with( - version: '1.7.8', - checksum: '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde' + version: '1.8.0', + checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25' ) end diff --git a/spec/hosts/roles/rke2agent_spec.rb b/spec/hosts/roles/rke2agent_spec.rb index 1f53028160..e53d47475c 100644 --- a/spec/hosts/roles/rke2agent_spec.rb +++ b/spec/hosts/roles/rke2agent_spec.rb @@ -8,25 +8,13 @@ include_examples 'k8snode profile' include_examples 'restic common' - case site - when 'dev', 'tu', 'ls' - it do - is_expected.to contain_class('rke2').with( - node_type: 'agent', - release_series: '1.32', - version: '1.32.2~rke2r1', - versionlock: true - ) - end - else - it do - is_expected.to contain_class('rke2').with( - node_type: 'agent', - release_series: '1.31', - version: '1.31.9~rke2r1', - versionlock: true - ) - end + it do + is_expected.to contain_class('rke2').with( + node_type: 'agent', + release_series: '1.32', + version: '1.32.2~rke2r1', + versionlock: true + ) end it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') } diff --git a/spec/hosts/roles/rke2server_spec.rb b/spec/hosts/roles/rke2server_spec.rb index cd24d6b870..e32c08bfd6 100644 --- a/spec/hosts/roles/rke2server_spec.rb +++ b/spec/hosts/roles/rke2server_spec.rb @@ -8,25 +8,13 @@ include_examples 'k8snode profile' include_examples 'restic common' - case site - when 'dev', 'tu', 'ls' - it do - is_expected.to contain_class('rke2').with( - node_type: 'server', - release_series: '1.32', - version: '1.32.2~rke2r1', - versionlock: true - ) - end - else - it do - is_expected.to contain_class('rke2').with( - node_type: 'server', - release_series: '1.31', - version: '1.31.9~rke2r1', - versionlock: true - ) - end + it do + is_expected.to contain_class('rke2').with( + node_type: 'server', + release_series: '1.32', + version: '1.32.2~rke2r1', + versionlock: true + ) end it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') } diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb index 5c191adf1d..b3a8188307 100644 --- a/spec/hosts/roles/rke_spec.rb +++ b/spec/hosts/roles/rke_spec.rb @@ -43,21 +43,11 @@ ) end - case site - when 'ls' - it do - is_expected.to contain_class('rke').with( - version: '1.8.0', - checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25' - ) - end - else - it do - is_expected.to contain_class('rke').with( - version: '1.7.8', - checksum: '9494448f684ab0f3f79c62aa9736cd718743ad94e78a291f49eafec8bc71abde' - ) - end + it do + is_expected.to contain_class('rke').with( + version: '1.8.0', + checksum: '8815da0452ae14a45566b534c48a2af6286ee73f800208ba6ec59188cb9a8d25' + ) end it do