Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update binary repos and versions to support modern Kubernetes #101

Merged
merged 5 commits into from
Sep 18, 2024
Merged

Update binary repos and versions to support modern Kubernetes #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7280624
Update URL templates for k8s repository
ananace Sep 16, 2024
2578993
Update Kubernetes/etcd to non-EoL versions
ananace Sep 16, 2024
53d08db
Retrieve a lost comma from the ether
ananace Sep 16, 2024
f1af11d
Update REFERENCE.md
ananace Sep 16, 2024
9dbaf16
Fix tests with new binary repo URL
ananace Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ Data type: `String[1]`

version of etcd to install

Default value: `'3.5.1'`
Default value: `'3.5.16'`

##### <a name="-k8s--firewall_type"></a>`firewall_type`

Expand Down Expand Up @@ -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}'`

##### <a name="-k8s--node_auth"></a>`node_auth`

Expand Down Expand Up @@ -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'`

##### <a name="-k8s--uid"></a>`uid`

Expand All @@ -489,7 +489,7 @@ Data type: `String[1]`

version of kubernetes to install

Default value: `'1.26.1'`
Default value: `'1.28.14'`

### <a name="k8s--install--cni_plugins"></a>`k8s::install::cni_plugins`

Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/binary_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@
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'
it do
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
Expand Down
Loading