From 45f7a40539cc6d45fa9b43ef9dffb3938dbd3469 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Tue, 13 Feb 2024 22:30:06 -0600 Subject: [PATCH 1/7] chore: Update k8s debian package repositories to pkgs.k8s.io --- ansible/group_vars/all/defaults.yaml | 6 +++++- ansible/group_vars/all/system.yaml | 6 +++--- ansible/roles/repo/tasks/debian.yaml | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index d6c72d386..ab36158e0 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -5,7 +5,11 @@ 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.5" +# Using kubernetes v1.28.5, this comment has been added to appear in version searches. +kubernetes_major: "1" +kubernetes_minor: "28" +kubernetes_patch: "5" +kubernetes_version: "{{ kubernetes_major }}.{{ kubernetes_minor }}.{{ kubernetes_patch }}" kubernetes_semver: "v{{ kubernetes_version }}" kubernetes_cni_version: "0.9.1" diff --git a/ansible/group_vars/all/system.yaml b/ansible/group_vars/all/system.yaml index 673292d2a..f2a01c3fc 100644 --- a/ansible/group_vars/all/system.yaml +++ b/ansible/group_vars/all/system.yaml @@ -7,9 +7,9 @@ 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://packages.cloud.google.com/apt/" -kubernetes_deb_gpg_key_url: "https://packages.cloud.google.com/apt/doc/apt-key.gpg" -kubernetes_deb_release_name: "kubernetes-xenial" +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_release_name: "/" # containerd package # Appstream is enabled by default in rhel8, so install the package from local repositories in that case diff --git a/ansible/roles/repo/tasks/debian.yaml b/ansible/roles/repo/tasks/debian.yaml index a24e41bf5..7329a3752 100644 --- a/ansible/roles/repo/tasks/debian.yaml +++ b/ansible/roles/repo/tasks/debian.yaml @@ -11,6 +11,6 @@ - name: add Kubernetes deb repository apt_repository: - repo: 'deb {{ kubernetes_deb_repository_url }} {{ kubernetes_deb_release_name }} main' + repo: 'deb {{ kubernetes_deb_repository_url }} {{ kubernetes_deb_release_name }}' retries: 3 delay: 3 From 6a887767cfb254cd32822295517b3e26a7e7841e Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Tue, 13 Feb 2024 22:47:17 -0600 Subject: [PATCH 2/7] fix: update suffix. --- ansible/group_vars/all/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index ab36158e0..62b4a8a9b 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -49,7 +49,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 }}-00" + kubernetes_deb: "{{ kubernetes_version }}-1.1" kubenode: "{{ kubernetes_version }}" # variable used for seeding images From 638fa437ebe744ba29567bd091d66631f86775fe Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Tue, 13 Feb 2024 23:05:02 -0600 Subject: [PATCH 3/7] fix: update crictl version --- ansible/group_vars/all/defaults.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index 62b4a8a9b..2d582dcde 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -18,19 +18,19 @@ 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: "1.26.0" +crictl_version: "{{ kubernetes_major }}.{{ kubernetes_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. 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: cda5e2143bf19f6b548110ffba0fe3565e03e8743fadd625fee3d62fc4134eed +crictl_sha256: 8dc78774f7cbeaf787994d386eec663f0a3cf24de1ea4893598096cb39ef2508 # The critools deb and rpm package versions. While the version derives directly from # the crictl verson, the package revision can change independently. # The initial revision is 00. -critools_deb: "{{ crictl_version }}-00" +critools_deb: "{{ crictl_version }}-1.1" # The initial revision 0. critools_rpm: "{{ crictl_version }}-0" From c62c4034131425e2224b845ae0769e74dd0658e8 Mon Sep 17 00:00:00 2001 From: Kaiwalya Joshi Date: Tue, 13 Feb 2024 23:52:36 -0600 Subject: [PATCH 4/7] fix: Revert back to non-templated string. --- ansible/group_vars/all/defaults.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index 2d582dcde..1f43194b8 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -5,11 +5,10 @@ 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. -# Using kubernetes v1.28.5, this comment has been added to appear in version searches. kubernetes_major: "1" kubernetes_minor: "28" kubernetes_patch: "5" -kubernetes_version: "{{ kubernetes_major }}.{{ kubernetes_minor }}.{{ kubernetes_patch }}" +kubernetes_version: "1.28.5" kubernetes_semver: "v{{ kubernetes_version }}" kubernetes_cni_version: "0.9.1" From 269c974e11879012d0f1326c27d7c43375908abe Mon Sep 17 00:00:00 2001 From: York Chen Date: Wed, 14 Feb 2024 18:47:41 +0800 Subject: [PATCH 5/7] chore: use 1.28.6 --- ansible/group_vars/all/defaults.yaml | 4 ++-- images/common.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index 1f43194b8..15f276cdd 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -7,8 +7,8 @@ python_path: "" # IMPORTANT When you update kubernetes_version, also update crictl_version. kubernetes_major: "1" kubernetes_minor: "28" -kubernetes_patch: "5" -kubernetes_version: "1.28.5" +kubernetes_patch: "6" +kubernetes_version: "1.28.6" kubernetes_semver: "v{{ kubernetes_version }}" kubernetes_cni_version: "0.9.1" diff --git a/images/common.yaml b/images/common.yaml index 2fce1eaf5..2f5c05151 100644 --- a/images/common.yaml +++ b/images/common.yaml @@ -1,5 +1,5 @@ --- -kubernetes_version: "1.28.5" +kubernetes_version: "1.28.6" download_images: true From c99fedfbbb7be16c394096efcf0bf9a5f9de0ec6 Mon Sep 17 00:00:00 2001 From: "Weiyanli Chen(York)" Date: Wed, 14 Feb 2024 23:16:32 -0500 Subject: [PATCH 6/7] build: Apply suggestions from code review Co-authored-by: Shalin Patel --- ansible/group_vars/all/defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/group_vars/all/defaults.yaml b/ansible/group_vars/all/defaults.yaml index 15f276cdd..c8a5e09c2 100644 --- a/ansible/group_vars/all/defaults.yaml +++ b/ansible/group_vars/all/defaults.yaml @@ -17,7 +17,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_major }}.{{ kubernetes_minor }}.0" +crictl_version: "{{ (kubernetes_version.split('.') | map('trim'))[:2] | join('.') }}.0" # On flatcar Linux, we install crictl from a release artifact, not a system package. # The url points to the linux/amd64 release artifact. From ca519c9d67eac1a04ddcccccd901227eed88a7da Mon Sep 17 00:00:00 2001 From: York Chen Date: Thu, 15 Feb 2024 12:17:11 +0800 Subject: [PATCH 7/7] 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