Skip to content

Commit

Permalink
feat: update Kubernetes to v1.29.4 (#1067)
Browse files Browse the repository at this point in the history
  • Loading branch information
dkoshkin authored Apr 30, 2024
1 parent 469376a commit 20706b8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions ansible/group_vars/all/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ python_path: ""
# If it's not there, the kubernetes_full_version will have "None" for a version number.
#
# IMPORTANT When you update kubernetes_version, also update crictl_version.
kubernetes_version: "1.28.7"
kubernetes_version: "1.29.4"
kubernetes_major_minor: "{{ (kubernetes_version.split('.') | map('trim'))[:2] | join('.') }}"
kubernetes_semver: "v{{ kubernetes_version }}"

Expand All @@ -21,7 +21,7 @@ crictl_version: "{{ kubernetes_major_minor }}.0"
# The url points to the linux/amd64 release artifact.
crictl_url: https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{ crictl_version }}/crictl-v{{ crictl_version }}-linux-amd64.tar.gz
# The sha256 sum verifies the integrity of the release artifact.
crictl_sha256: 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508
crictl_sha256: d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb


# The critools deb and rpm package versions. While the version derives directly from
Expand All @@ -46,7 +46,7 @@ package_versions:
enable_repository_installation: "{{ (spec.osPackages.enableAdditionalRepositories if spec.osPackages is defined else true)|default(true)|bool }}"
# the version may contain d2iq specific suffix, remove it when downloading packages
kubernetes_rpm: "{{ kubernetes_version }}-0"
kubernetes_deb: "{{ kubernetes_version }}-1.1"
kubernetes_deb: "{{ kubernetes_version }}-2.1"
kubenode: "{{ kubernetes_version }}"

# variable used for seeding images
Expand Down
11 changes: 6 additions & 5 deletions bundles/ubuntu20.04/bundle.sh.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ export DEBIAN_FRONTEND=noninteractive
apt-get update && apt-get install -y --no-install-recommends \
apt-transport-https software-properties-common dpkg-dev curl gpg

DEB_PATCH_VERSION="1.1"
KUBERNETES_DEB_BUILD_VERSION="2.1"
CRI_TOOLS_DEB_BUILD_VERSION="1.1"

# Install dependencies.
mkdir -p /etc/apt/keyrings
Expand All @@ -16,10 +17,10 @@ apt-cache depends --recurse --no-recommends --no-suggests --no-conflicts --no-br

# The list returned by apt-cache depends does not contain the versions
# Append the bare Kubernetes packages with the provided versions
sed -i 's/kubelet/kubelet='"{{ .KubernetesVersion }}-${DEB_PATCH_VERSION}"'/' /tmp/packages
sed -i 's/kubectl/kubectl='"{{ .KubernetesVersion }}-${DEB_PATCH_VERSION}"'/' /tmp/packages
sed -i 's/kubeadm/kubeadm='"{{ .KubernetesVersion }}-${DEB_PATCH_VERSION}"'/' /tmp/packages
sed -i 's/cri-tools/cri-tools='"{{ .CRIToolsVersion }}-${DEB_PATCH_VERSION}"'/' /tmp/packages
sed -i 's/kubelet/kubelet='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
sed -i 's/kubectl/kubectl='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
sed -i 's/kubeadm/kubeadm='"{{ .KubernetesVersion }}-${KUBERNETES_DEB_BUILD_VERSION}"'/' /tmp/packages
sed -i 's/cri-tools/cri-tools='"{{ .CRIToolsVersion }}-${CRI_TOOLS_DEB_BUILD_VERSION}"'/' /tmp/packages
# https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues/4745 pins version for CAPA
sed -i 's/cloud-init/cloud-init='"23.1.2-0ubuntu0~20.04.2"'/' /tmp/packages

Expand Down
6 changes: 3 additions & 3 deletions bundles/ubuntu20.04/packages.txt.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ nfs-common
python3-cryptography
python3-pip
libseccomp2
kubectl={{ .KubernetesVersion }}-1.1
kubelet={{ .KubernetesVersion }}-1.1
kubeadm={{ .KubernetesVersion }}-1.1
kubectl={{ .KubernetesVersion }}-2.1
kubelet={{ .KubernetesVersion }}-2.1
kubeadm={{ .KubernetesVersion }}-2.1
cloud-init
2 changes: 1 addition & 1 deletion images/common.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
kubernetes_version: "1.28.7"
kubernetes_version: "1.29.4"

download_images: true

Expand Down

0 comments on commit 20706b8

Please sign in to comment.