From 7280624e4bc58dea672f2c4c8aaad2ea139e4a27 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 16 Sep 2024 09:42:38 +0200 Subject: [PATCH 1/5] Update URL templates for k8s repository --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 1e13141..9bd1717 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -78,8 +78,8 @@ Boolean $purge_manifests = true, - String[1] $native_url_template = 'https://storage.googleapis.com/kubernetes-release/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}', - String[1] $tarball_url_template = 'https://dl.k8s.io/v%{version}/kubernetes-%{component}-%{kernel}-%{arch}.tar.gz', + String[1] $native_url_template = 'https://dl.k8s.io/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}' + String[1] $tarball_url_template = 'https://dl.k8s.io/release/v%{version}/kubernetes-%{component}-%{kernel}-%{arch}.tar.gz', String[1] $package_template = 'kubernetes-%{component}', String[1] $hyperkube_name = 'hyperkube', Optional[Stdlib::Unixpath] $sysconfig_path = undef, From 2578993e34cd9bd63da0b6ae15f2f0d00a4b3cf5 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 16 Sep 2024 09:44:10 +0200 Subject: [PATCH 2/5] Update Kubernetes/etcd to non-EoL versions For Kubernetes this means a new sub-major in the form of 1.28, whereas etcd just gets the latest patch on the same 3.5 branch --- manifests/init.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 9bd1717..93955d8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,8 +50,8 @@ K8s::Ensure $ensure = 'present', Enum['container', 'native'] $packaging = 'native', K8s::Native_packaging $native_packaging = 'loose', - String[1] $version = '1.26.1', - String[1] $etcd_version = '3.5.1', + String[1] $version = '1.28.14', + String[1] $etcd_version = '3.5.16', String[1] $container_registry = 'registry.k8s.io', Optional[String[1]] $container_image_tag = undef, From 53d08db467297038125835df186768900f79c804 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 16 Sep 2024 09:50:34 +0200 Subject: [PATCH 3/5] Retrieve a lost comma from the ether --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 93955d8..c5965be 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -78,7 +78,7 @@ Boolean $purge_manifests = true, - String[1] $native_url_template = 'https://dl.k8s.io/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}' + String[1] $native_url_template = 'https://dl.k8s.io/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}', String[1] $tarball_url_template = 'https://dl.k8s.io/release/v%{version}/kubernetes-%{component}-%{kernel}-%{arch}.tar.gz', String[1] $package_template = 'kubernetes-%{component}', String[1] $hyperkube_name = 'hyperkube', From f1af11dc4ee609e2bdc9d0156dafa3a529bc69ce Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 16 Sep 2024 09:55:46 +0200 Subject: [PATCH 4/5] Update REFERENCE.md --- REFERENCE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index ccfc940..7e91836 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -249,7 +249,7 @@ Data type: `String[1]` version of etcd to install -Default value: `'3.5.1'` +Default value: `'3.5.16'` ##### `firewall_type` @@ -377,7 +377,7 @@ Data type: `String[1]` template for native packaging -Default value: `'https://storage.googleapis.com/kubernetes-release/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}'` +Default value: `'https://dl.k8s.io/release/v%{version}/bin/%{kernel}/%{arch}/%{binary}'` ##### `node_auth` @@ -465,7 +465,7 @@ Data type: `String[1]` template for tarball packaging -Default value: `'https://dl.k8s.io/v%{version}/kubernetes-%{component}-%{kernel}-%{arch}.tar.gz'` +Default value: `'https://dl.k8s.io/release/v%{version}/kubernetes-%{component}-%{kernel}-%{arch}.tar.gz'` ##### `uid` @@ -489,7 +489,7 @@ Data type: `String[1]` version of kubernetes to install -Default value: `'1.26.1'` +Default value: `'1.28.14'` ### `k8s::install::cni_plugins` From 9dbaf161730ea36f89b4c55ba8a67a0800cee551 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 16 Sep 2024 10:00:03 +0200 Subject: [PATCH 5/5] Fix tests with new binary repo URL --- spec/defines/binary_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/defines/binary_spec.rb b/spec/defines/binary_spec.rb index b725dc9..0189858 100644 --- a/spec/defines/binary_spec.rb +++ b/spec/defines/binary_spec.rb @@ -68,7 +68,7 @@ is_expected.to contain_file("/opt/k8s/1.0/#{binary}").with( ensure: 'present', mode: '0755', - source: "https://storage.googleapis.com/kubernetes-release/release/v1.0/bin/linux/amd64/#{binary}" + source: "https://dl.k8s.io/release/v1.0/bin/linux/amd64/#{binary}" ) end when 'hyperkube' @@ -76,7 +76,7 @@ is_expected.to contain_file('/opt/k8s/1.0/hyperkube').with( ensure: 'present', mode: '0755', - source: 'https://storage.googleapis.com/kubernetes-release/release/v1.0/bin/linux/amd64/hyperkube' + source: 'https://dl.k8s.io/release/v1.0/bin/linux/amd64/hyperkube' ) end end