Skip to content

Commit

Permalink
(rke/rke2) bump rke client v1.6.2 and rke2 k8s v1.29.9
Browse files Browse the repository at this point in the history
  • Loading branch information
cbarria committed Sep 27, 2024
1 parent 66993ee commit 1321c9d
Show file tree
Hide file tree
Showing 15 changed files with 84 additions and 42 deletions.
2 changes: 2 additions & 0 deletions hieradata/site/dev/role/rke.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
profile::core::rke::version: "1.6.2"
3 changes: 3 additions & 0 deletions hieradata/site/dev/role/rke2agent.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
rke2::release_series: "1.29"
rke2::version: "1.29.9~rke2r1"
3 changes: 3 additions & 0 deletions hieradata/site/dev/role/rke2server.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
rke2::release_series: "1.29"
rke2::version: "1.29.9~rke2r1"
2 changes: 1 addition & 1 deletion site/profile/manifests/core/rke.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
24 changes: 12 additions & 12 deletions spec/classes/core/rke_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/ayekan01.ls.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

it do
is_expected.to contain_class('rke').with(
version: '1.5.12'
version: '1.6.2'
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/kueyen01.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

it do
is_expected.to contain_class('rke').with(
version: '1.5.12'
version: '1.6.2'
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/namkueyen01.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

it do
is_expected.to contain_class('rke').with(
version: '1.5.12'
version: '1.6.2'
)
end

Expand Down
2 changes: 1 addition & 1 deletion spec/hosts/nodes/rancher01.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

it do
is_expected.to contain_class('rke').with(
version: '1.5.12'
version: '1.6.2'
)
end

Expand Down
4 changes: 2 additions & 2 deletions spec/hosts/nodes/ruka01.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions spec/hosts/nodes/ruka04.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,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

Expand Down
4 changes: 2 additions & 2 deletions spec/hosts/nodes/ruka07.dev.lsst.org_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@
it do
is_expected.to contain_class('rke2').with(
node_type: 'agent',
release_series: '1.28',
version: '1.28.12~rke2r1'
release_series: '1.29',
version: '1.29.9~rke2r1'
)
end

Expand Down
26 changes: 19 additions & 7 deletions spec/hosts/roles/rke2agent_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@
include_examples 'k8snode profile'
include_examples 'restic common'

it do
is_expected.to contain_class('rke2').with(
node_type: 'agent',
release_series: '1.28',
version: '1.28.12~rke2r1',
versionlock: true
)
case site
when 'dev'
it do
is_expected.to contain_class('rke2').with(
node_type: 'agent',
release_series: '1.29',
version: '1.29.9~rke2r1',
versionlock: true
)
end
else
it do
is_expected.to contain_class('rke2').with(
node_type: 'agent',
release_series: '1.28',
version: '1.28.12~rke2r1',
versionlock: true
)
end
end

it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }
Expand Down
26 changes: 19 additions & 7 deletions spec/hosts/roles/rke2server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,25 @@
include_examples 'k8snode profile'
include_examples 'restic common'

it do
is_expected.to contain_class('rke2').with(
node_type: 'server',
release_series: '1.28',
version: '1.28.12~rke2r1',
versionlock: true
)
case site
when 'dev'
it do
is_expected.to contain_class('rke2').with(
node_type: 'server',
release_series: '1.29',
version: '1.29.9~rke2r1',
versionlock: true
)
end
else
it do
is_expected.to contain_class('rke2').with(
node_type: 'server',
release_series: '1.28',
version: '1.28.12~rke2r1',
versionlock: true
)
end
end

it { expect(catalogue.resource('class', 'rke2')[:config]).to include('server') }
Expand Down
20 changes: 15 additions & 5 deletions spec/hosts/roles/rke_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1321c9d

Please sign in to comment.