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

feat: bump the k8s version #1188

Merged
merged 5 commits into from
Sep 26, 2024
Merged

feat: bump the k8s version #1188

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
b33c61d
feat: bump Containerd patch release 1.7.22
SandhyaRavi2403 Sep 23, 2024
478a4c4
feat: bump the k8s version
SandhyaRavi2403 Sep 25, 2024
dac1e0b
feat: Update cni vesrion
SandhyaRavi2403 Sep 25, 2024
c3c49c5
feat: update crictl tool
SandhyaRavi2403 Sep 25, 2024
6f401da
feat: update crictl tool
SandhyaRavi2403 Sep 26, 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
4 changes: 2 additions & 2 deletions Dockerfile.devkit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 5 additions & 5 deletions ansible/group_vars/all/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
dkoshkin marked this conversation as resolved.
Show resolved Hide resolved
dkoshkin marked this conversation as resolved.
Show resolved Hide resolved

# 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
Expand All @@ -32,7 +32,7 @@ critools_deb: "{{ crictl_version }}-1.1"
critools_rpm: "{{ crictl_version }}-0"

# Containerd container runtime version.
containerd_version: "1.6.33"
containerd_version: "1.7.22"

# NOTE(jkoelker) `nvidia_cuda_version` is set via an override, it is listed
# empty here for documentation.
Expand Down
4 changes: 2 additions & 2 deletions cmd/konvoy-image-wrapper/cmd/create-package-bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion images/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
kubernetes_version: "1.29.6"
kubernetes_version: "1.30.5"

packer:
goss_arch: amd64
Expand Down
Loading