Skip to content

Commit

Permalink
build: use 1 single k8s version
Browse files Browse the repository at this point in the history
  • Loading branch information
cwyl02 committed Feb 15, 2024
1 parent c99fedf commit ca519c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions ansible/group_vars/all/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ansible/group_vars/all/system.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ca519c9

Please sign in to comment.