From 3e41a47ee095b5d91ba674bcd5d49377094d37f7 Mon Sep 17 00:00:00 2001
From: Dimitri Koshkin <dimitri.koshkin@nutanix.com>
Date: Tue, 21 May 2024 15:03:14 -0700
Subject: [PATCH] feat: update Kubernetes to v1.29.5

---
 ansible/group_vars/all/defaults.yaml    | 4 ++--
 bundles/ubuntu20.04/bundle.sh.gotmpl    | 2 +-
 bundles/ubuntu20.04/packages.txt.gotmpl | 6 +++---
 images/common.yaml                      | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml
index c7b91e87e..870e2e42a 100644
--- a/ansible/group_vars/all/defaults.yaml
+++ b/ansible/group_vars/all/defaults.yaml
@@ -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.29.4"
+kubernetes_version: "1.29.5"
 kubernetes_major_minor: "{{ (kubernetes_version.split('.') | map('trim'))[:2] | join('.') }}"
 kubernetes_semver: "v{{ kubernetes_version }}"
 
@@ -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 }}-2.1"
+  kubernetes_deb: "{{ kubernetes_version }}-1.1"
   kubenode: "{{ kubernetes_version }}"
 
 # variable used for seeding images
diff --git a/bundles/ubuntu20.04/bundle.sh.gotmpl b/bundles/ubuntu20.04/bundle.sh.gotmpl
index d4ea5a8ac..7705d3ddf 100644
--- a/bundles/ubuntu20.04/bundle.sh.gotmpl
+++ b/bundles/ubuntu20.04/bundle.sh.gotmpl
@@ -4,7 +4,7 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get update && apt-get install -y --no-install-recommends \
 apt-transport-https software-properties-common dpkg-dev curl gpg
 
-KUBERNETES_DEB_BUILD_VERSION="2.1"
+KUBERNETES_DEB_BUILD_VERSION="1.1"
 CRI_TOOLS_DEB_BUILD_VERSION="1.1"
 
 # Install dependencies.
diff --git a/bundles/ubuntu20.04/packages.txt.gotmpl b/bundles/ubuntu20.04/packages.txt.gotmpl
index aad3ab529..e9c828c81 100644
--- a/bundles/ubuntu20.04/packages.txt.gotmpl
+++ b/bundles/ubuntu20.04/packages.txt.gotmpl
@@ -4,7 +4,7 @@ nfs-common
 python3-cryptography
 python3-pip
 libseccomp2
-kubectl={{ .KubernetesVersion }}-2.1
-kubelet={{ .KubernetesVersion }}-2.1
-kubeadm={{ .KubernetesVersion }}-2.1
+kubectl={{ .KubernetesVersion }}-1.1
+kubelet={{ .KubernetesVersion }}-1.1
+kubeadm={{ .KubernetesVersion }}-1.1
 cloud-init
diff --git a/images/common.yaml b/images/common.yaml
index 37b17e781..714431aa4 100644
--- a/images/common.yaml
+++ b/images/common.yaml
@@ -1,5 +1,5 @@
 ---
-kubernetes_version: "1.29.4"
+kubernetes_version: "1.29.5"
 
 download_images: true