From 686187df476d3eee8ed8a229ae9d66cee8e06c63 Mon Sep 17 00:00:00 2001 From: Carlos Barria Date: Fri, 27 Sep 2024 14:17:09 -0300 Subject: [PATCH] (rke/rke2) bump rke client v1.6.2 and rke2 k8s v1.29.9 --- hieradata/site/dev/role/rke.yaml | 4 ++++ site/profile/manifests/core/rke.pp | 2 +- spec/classes/core/rke_spec.rb | 24 +++++++++---------- spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb | 2 +- .../hosts/nodes/kueyen01.dev.lsst.org_spec.rb | 2 +- .../nodes/namkueyen01.dev.lsst.org_spec.rb | 2 +- .../nodes/rancher01.dev.lsst.org_spec.rb | 2 +- spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb | 4 ++-- spec/hosts/roles/rke_spec.rb | 20 ++++++++++++---- 9 files changed, 38 insertions(+), 24 deletions(-) create mode 100644 hieradata/site/dev/role/rke.yaml diff --git a/hieradata/site/dev/role/rke.yaml b/hieradata/site/dev/role/rke.yaml new file mode 100644 index 0000000000..7dbad4b76c --- /dev/null +++ b/hieradata/site/dev/role/rke.yaml @@ -0,0 +1,4 @@ +--- +profile::core::rke::version: "1.6.2" +rke2::release_series: "1.29" +rke2::version: "1.29.9~rke2r1" diff --git a/site/profile/manifests/core/rke.pp b/site/profile/manifests/core/rke.pp index ed0cb964c5..b1fcfa460f 100644 --- a/site/profile/manifests/core/rke.pp +++ b/site/profile/manifests/core/rke.pp @@ -37,9 +37,9 @@ } $rke_checksum = $version ? { - '1.5.9' => '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b', '1.5.10' => 'cd5d3e8cd77f955015981751c30022cead0bd78f14216fcd1c827c6a7e5cc26e', '1.5.12' => 'f0d1f6981edbb4c93f525ee51bc2a8ad729ba33c04f21a95f5fc86af4a7af586', + '1.6.2' => '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7', default => undef, } unless ($rke_checksum) { diff --git a/spec/classes/core/rke_spec.rb b/spec/classes/core/rke_spec.rb index 7e07ebea66..16277dbfd8 100644 --- a/spec/classes/core/rke_spec.rb +++ b/spec/classes/core/rke_spec.rb @@ -68,10 +68,10 @@ end context 'with version param' do - context 'when 1.5.9' do + context 'when 1.5.10' do let(:params) do { - version: '1.5.9', + version: '1.5.10', } end @@ -81,16 +81,16 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.9', - checksum: '1d31248135c2d0ef0c3606313d80bd27a199b98567a053036b9e49e13827f54b' + version: '1.5.10', + checksum: 'cd5d3e8cd77f955015981751c30022cead0bd78f14216fcd1c827c6a7e5cc26e' ) end end - context 'when 1.5.10' do + context 'when 1.5.12' do let(:params) do { - version: '1.5.10', + version: '1.5.12', } end @@ -100,16 +100,16 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.10', - checksum: 'cd5d3e8cd77f955015981751c30022cead0bd78f14216fcd1c827c6a7e5cc26e' + version: '1.5.12', + checksum: 'f0d1f6981edbb4c93f525ee51bc2a8ad729ba33c04f21a95f5fc86af4a7af586' ) end end - context 'when 1.5.12' do + context 'when 1.6.2' do let(:params) do { - version: '1.5.12', + version: '1.6.2', } end @@ -119,8 +119,8 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.12', - checksum: 'f0d1f6981edbb4c93f525ee51bc2a8ad729ba33c04f21a95f5fc86af4a7af586' + version: '1.6.2', + checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7' ) end end diff --git a/spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb b/spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb index 33f9ed496e..b05da9a41b 100644 --- a/spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb +++ b/spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb @@ -49,7 +49,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.12' + version: '1.6.2' ) end diff --git a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb index 800945d812..dbfa98f34b 100644 --- a/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb @@ -49,7 +49,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.12' + version: '1.6.2' ) end diff --git a/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb b/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb index 49275ad0ad..19fd253870 100644 --- a/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb @@ -49,7 +49,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.12' + version: '1.6.2' ) end diff --git a/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb b/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb index 558252bba6..12fee9b33a 100644 --- a/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb @@ -31,7 +31,7 @@ it do is_expected.to contain_class('rke').with( - version: '1.5.12' + version: '1.6.2' ) end diff --git a/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb b/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb index f078008b92..5bf283c546 100644 --- a/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb +++ b/spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb @@ -61,8 +61,8 @@ it do is_expected.to contain_class('rke2').with( node_type: 'server', - release_series: '1.28', - version: '1.28.12~rke2r1' + release_series: '1.29', + version: '1.29.9~rke2r1' ) end diff --git a/spec/hosts/roles/rke_spec.rb b/spec/hosts/roles/rke_spec.rb index f5b2777b3e..da5f72ba17 100644 --- a/spec/hosts/roles/rke_spec.rb +++ b/spec/hosts/roles/rke_spec.rb @@ -43,11 +43,21 @@ ) end - it do - is_expected.to contain_class('rke').with( - version: '1.5.12', - checksum: 'f0d1f6981edbb4c93f525ee51bc2a8ad729ba33c04f21a95f5fc86af4a7af586' - ) + case site + when 'dev' + it do + is_expected.to contain_class('rke').with( + version: '1.6.2', + checksum: '68608a97432b4472d3e8f850a7bde0119582ea80fbb9ead923cd831ca97db1d7' + ) + end + else + it do + is_expected.to contain_class('rke').with( + version: '1.5.12', + checksum: 'f0d1f6981edbb4c93f525ee51bc2a8ad729ba33c04f21a95f5fc86af4a7af586' + ) + end end it do