From eddd723ea8f1108045470766b269aabeeb6326f8 Mon Sep 17 00:00:00 2001 From: SandhyaRavi2403 Date: Fri, 27 Sep 2024 00:10:07 +0530 Subject: [PATCH] feat: bump the k8s version (#1188) * feat: bump Containerd patch release 1.7.22 * feat: bump the k8s version * feat: Update cni vesrion Co-authored-by: Dimitri Koshkin * feat: update crictl tool * feat: update crictl tool --------- Co-authored-by: Dimitri Koshkin --- Dockerfile.devkit | 4 ++-- ansible/group_vars/all/defaults.yaml | 8 ++++---- cmd/konvoy-image-wrapper/cmd/create-package-bundle.go | 4 ++-- images/common.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile.devkit b/Dockerfile.devkit index 1d6546c09..b3f43097a 100644 --- a/Dockerfile.devkit +++ b/Dockerfile.devkit @@ -87,7 +87,7 @@ RUN \ curl -o /opt/kubectl-${KUBERNETES_VERSION}-0.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/kubectl-${KUBERNETES_VERSION}-0.x86_64.rpm && \ curl -o /opt/kubeadm-${KUBERNETES_VERSION}-0.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/kubeadm-${KUBERNETES_VERSION}-0.x86_64.rpm && \ curl -o /opt/kubelet-${KUBERNETES_VERSION}-0.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/kubelet-${KUBERNETES_VERSION}-0.x86_64.rpm && \ - export CRICTL_TOOLS_VERSION="$(echo ${KUBERNETES_VERSION} | cut -d. -f1-2).0" && \ + export CRICTL_TOOLS_VERSION="$(echo ${KUBERNETES_VERSION} | cut -d. -f1-2).1" && \ curl -o /opt/cri-tools-${CRICTL_TOOLS_VERSION}-0.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/cri-tools-${CRICTL_TOOLS_VERSION}-0.x86_64.rpm && \ export CNI_VERSION=$(awk -F': ' '/kubernetes_cni_version/ {print $2}' ansible/group_vars/all/defaults.yaml | sed -n '1p' | xargs) && \ curl -o /opt/kubernetes-cni-${CNI_VERSION}-0.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/kubernetes-cni-${CNI_VERSION}-0.x86_64.rpm @@ -100,7 +100,7 @@ RUN \ curl -o /opt/kubectl-${KUBERNETES_VERSION}-0-fips.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-fips/x86_64/kubectl-${KUBERNETES_VERSION}-0.x86_64.rpm && \ curl -o /opt/kubeadm-${KUBERNETES_VERSION}-0-fips.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-fips/x86_64/kubeadm-${KUBERNETES_VERSION}-0.x86_64.rpm && \ curl -o /opt/kubelet-${KUBERNETES_VERSION}-0-fips.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-fips/x86_64/kubelet-${KUBERNETES_VERSION}-0.x86_64.rpm && \ - export CRICTL_TOOLS_VERSION="$(echo ${KUBERNETES_VERSION} | cut -d. -f1-2).0" && \ + export CRICTL_TOOLS_VERSION="$(echo ${KUBERNETES_VERSION} | cut -d. -f1-2).1" && \ curl -o /opt/cri-tools-${CRICTL_TOOLS_VERSION}-0-fips.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-nokmem/x86_64/cri-tools-${CRICTL_TOOLS_VERSION}-0.x86_64.rpm && \ export CNI_VERSION=$(awk -F': ' '/kubernetes_cni_version/ {print $2}' ansible/group_vars/all/defaults.yaml | sed -n '1p' | xargs) && \ curl -o /opt/kubernetes-cni-${CNI_VERSION}-0-fips.rpm https://packages.d2iq.com/konvoy/stable/linux/repos/el/kubernetes-v${KUBERNETES_VERSION}-fips/x86_64/kubernetes-cni-${CNI_VERSION}-0.x86_64.rpm diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index cf728a4cf..655e902e8 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -5,23 +5,23 @@ 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.6" +kubernetes_version: "1.30.5" kubernetes_major_minor: "{{ (kubernetes_version.split('.') | map('trim'))[:2] | join('.') }}" kubernetes_semver: "v{{ kubernetes_version }}" -kubernetes_cni_version: "1.3.0" +kubernetes_cni_version: "1.4.0" # The crictl CLI is released as part of the http://sigs.k8s.io/cri-tools project. # The project release closely follows the Kubernetes release cycle, and uses a # nearly identical version scheme. # IMPORTANT When you update crictl_version, also update crictl_sha256. -crictl_version: "{{ kubernetes_major_minor }}.0" +crictl_version: "{{ kubernetes_major_minor }}.1" # On flatcar Linux, we install crictl from a release artifact, not a system package. # 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: d16a1ffb3938f5a19d5c8f45d363bd091ef89c0bc4d44ad16b933eede32fdcbb +crictl_sha256: 71873cdeeeb6c9ee0f79c27b45db38066da81f0c30dcda909b4eedc3aff63f59 # The critools deb and rpm package versions. While the version derives directly from diff --git a/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go b/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go index 85f911c92..76218b716 100644 --- a/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go +++ b/cmd/konvoy-image-wrapper/cmd/create-package-bundle.go @@ -292,8 +292,8 @@ func templateObjects(targetOS, kubernetesVersion, outputDir string, fips, fetchK var kubernetesMajorMinorVersion string if targetOS == "ubuntu-20.04" { kubernetesMajorMinorVersionNoV := strings.Join(strings.Split(kubernetesVersion, ".")[0:2], ".") - // according to ansible.group_vars/all/defaults.yaml L18 this is always k8s major minor.0 - criToolsVersion = fmt.Sprintf("%s.0", kubernetesMajorMinorVersionNoV) + // according to ansible.group_vars/all/defaults.yaml L18 this is k8s major minor.1 + criToolsVersion = fmt.Sprintf("%s.1", kubernetesMajorMinorVersionNoV) kubernetesMajorMinorVersion = fmt.Sprintf("v%s", kubernetesMajorMinorVersionNoV) } templateInput := struct { diff --git a/images/common.yaml b/images/common.yaml index 3f46c583d..a1cb5b353 100644 --- a/images/common.yaml +++ b/images/common.yaml @@ -1,5 +1,5 @@ --- -kubernetes_version: "1.29.6" +kubernetes_version: "1.30.5" packer: goss_arch: amd64