From ca519c9d67eac1a04ddcccccd901227eed88a7da Mon Sep 17 00:00:00 2001 From: York Chen Date: Thu, 15 Feb 2024 12:17:11 +0800 Subject: [PATCH] build: use 1 single k8s version --- ansible/group_vars/all/defaults.yaml | 6 ++---- ansible/group_vars/all/system.yaml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index c8a5e09c2..797ca0d86 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -5,10 +5,8 @@ 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_major: "1" -kubernetes_minor: "28" -kubernetes_patch: "6" kubernetes_version: "1.28.6" +kubernetes_major_minor: "{{ (kubernetes_version.split('.') | map('trim'))[:2] | join('.') }}" kubernetes_semver: "v{{ kubernetes_version }}" kubernetes_cni_version: "0.9.1" @@ -17,7 +15,7 @@ kubernetes_cni_version: "0.9.1" # 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_version.split('.') | map('trim'))[:2] | join('.') }}.0" +crictl_version: "{{ kubernetes_major_minor }}.0" # On flatcar Linux, we install crictl from a release artifact, not a system package. # The url points to the linux/amd64 release artifact. diff --git a/ansible/group_vars/all/system.yaml b/ansible/group_vars/all/system.yaml index f2a01c3fc..93f1e78e3 100644 --- a/ansible/group_vars/all/system.yaml +++ b/ansible/group_vars/all/system.yaml @@ -7,8 +7,8 @@ kubernetes_rpm_repository_url: "https://packages.d2iq.com/konvoy/stable/linux/re kubernetes_rpm_gpg_key_url: "https://packages.d2iq.com/konvoy/stable/linux/repos/d2iq-sign-authority-gpg-public-key" ## Debian -kubernetes_deb_repository_url: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_major }}.{{ kubernetes_minor }}/deb/" -kubernetes_deb_gpg_key_url: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_major }}.{{ kubernetes_minor }}/deb/Release.key" +kubernetes_deb_repository_url: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_major_minor }}/deb/" +kubernetes_deb_gpg_key_url: "https://pkgs.k8s.io/core:/stable:/v{{ kubernetes_major_minor }}/deb/Release.key" kubernetes_deb_release_name: "/" # containerd package