Upgrade versions (#9798)

The following applications have been upgraded:

* Cilium
* Helm
* crun
* Katacontainers
* youki
* gvisor
* skopeo
* yq

Signed-off-by: Victor Morales <chipahuac@hotmail.com>
pull/10277/head
Victor Morales 2023-07-05 04:32:58 -06:00 committed by GitHub
parent 5d00b851ce
commit 78c1775661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 781 additions and 358 deletions

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}=1.4.9-1" '1.4.9': "{{ containerd_package }}=1.4.9-1"
'1.4.12': "{{ containerd_package }}=1.4.12-1" '1.4.12': "{{ containerd_package }}=1.4.12-1"
'1.6.4': "{{ containerd_package }}=1.6.4-1" '1.6.4': "{{ containerd_package }}=1.6.4-1"
'stable': "{{ containerd_package }}=1.6.4-1" '1.6.6': "{{ containerd_package }}=1.6.6-1"
'edge': "{{ containerd_package }}=1.6.4-1" '1.6.7': "{{ containerd_package }}=1.6.7-1"
'1.6.8': "{{ containerd_package }}=1.6.8-1"
'1.6.9': "{{ containerd_package }}=1.6.9-1"
'1.6.10': "{{ containerd_package }}=1.6.10-1"
'1.6.11': "{{ containerd_package }}=1.6.11-1"
'1.6.12': "{{ containerd_package }}=1.6.12-1"
'1.6.13': "{{ containerd_package }}=1.6.13-1"
'1.6.14': "{{ containerd_package }}=1.6.14-1"
'1.6.15': "{{ containerd_package }}=1.6.15-1"
'1.6.16': "{{ containerd_package }}=1.6.16-1"
'1.6.18': "{{ containerd_package }}=1.6.18-1"
'stable': "{{ containerd_package }}=1.6.18-1"
'edge': "{{ containerd_package }}=1.6.18-1"
# https://download.docker.com/linux/debian/ # https://download.docker.com/linux/debian/
docker_versioned_pkg: docker_versioned_pkg:

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.fc{{ ansible_distribution_major_version }}"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}" '1.4.12': "{{ containerd_package }}-1.4.12-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.4': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}" '1.6.4': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}" '1.6.6': "{{ containerd_package }}-1.6.6-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.4-3.1.fc{{ ansible_distribution_major_version }}" '1.6.7': "{{ containerd_package }}-1.6.7-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.8': "{{ containerd_package }}-1.6.8-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.9': "{{ containerd_package }}-1.6.9-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.10': "{{ containerd_package }}-1.6.10-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.11': "{{ containerd_package }}-1.6.11-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.12': "{{ containerd_package }}-1.6.12-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.13': "{{ containerd_package }}-1.6.13-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.14': "{{ containerd_package }}-1.6.14-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.15': "{{ containerd_package }}-1.6.15-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.fc{{ ansible_distribution_major_version }}"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.18-3.1.fc{{ ansible_distribution_major_version }}"
# https://docs.docker.com/install/linux/docker-ce/fedora/ # https://docs.docker.com/install/linux/docker-ce/fedora/
# https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/ # https://download.docker.com/linux/fedora/<fedora-version>/x86_64/stable/Packages/

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.6': "{{ containerd_package }}-1.6.6-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.7': "{{ containerd_package }}-1.6.7-3.1.el{{ ansible_distribution_major_version }}"
'1.6.8': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}"
'1.6.9': "{{ containerd_package }}-1.6.9-3.1.el{{ ansible_distribution_major_version }}"
'1.6.10': "{{ containerd_package }}-1.6.10-3.1.el{{ ansible_distribution_major_version }}"
'1.6.11': "{{ containerd_package }}-1.6.11-3.1.el{{ ansible_distribution_major_version }}"
'1.6.12': "{{ containerd_package }}-1.6.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.13': "{{ containerd_package }}-1.6.13-3.1.el{{ ansible_distribution_major_version }}"
'1.6.14': "{{ containerd_package }}-1.6.14-3.1.el{{ ansible_distribution_major_version }}"
'1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
docker_version: 19.03 docker_version: 19.03
docker_cli_version: 19.03 docker_cli_version: 19.03

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el7" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el7"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el7" '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el7"
'1.6.4': "{{ containerd_package }}-1.6.4-3.1.el7" '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el7"
'stable': "{{ containerd_package }}-1.6.4-3.1.el7" '1.6.6': "{{ containerd_package }}-1.6.6-3.1.el7"
'edge': "{{ containerd_package }}-1.6.4-3.1.el7" '1.6.7': "{{ containerd_package }}-1.6.7-3.1.el7"
'1.6.8': "{{ containerd_package }}-1.6.8-3.1.el7"
'1.6.9': "{{ containerd_package }}-1.6.9-3.1.el7"
'1.6.10': "{{ containerd_package }}-1.6.10-3.1.el7"
'1.6.11': "{{ containerd_package }}-1.6.11-3.1.el7"
'1.6.12': "{{ containerd_package }}-1.6.12-3.1.el7"
'1.6.13': "{{ containerd_package }}-1.6.13-3.1.el7"
'1.6.14': "{{ containerd_package }}-1.6.14-3.1.el7"
'1.6.15': "{{ containerd_package }}-1.6.15-3.1.el7"
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.el7"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el7"
'stable': "{{ containerd_package }}-1.6.18-3.1.el7"
'edge': "{{ containerd_package }}-1.6.18-3.1.el7"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}" '1.4.9': "{{ containerd_package }}-1.4.9-3.1.el{{ ansible_distribution_major_version }}"
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.6': "{{ containerd_package }}-1.6.6-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.7': "{{ containerd_package }}-1.6.7-3.1.el{{ ansible_distribution_major_version }}"
'1.6.8': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}"
'1.6.9': "{{ containerd_package }}-1.6.9-3.1.el{{ ansible_distribution_major_version }}"
'1.6.10': "{{ containerd_package }}-1.6.10-3.1.el{{ ansible_distribution_major_version }}"
'1.6.11': "{{ containerd_package }}-1.6.11-3.1.el{{ ansible_distribution_major_version }}"
'1.6.12': "{{ containerd_package }}-1.6.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.13': "{{ containerd_package }}-1.6.13-3.1.el{{ ansible_distribution_major_version }}"
'1.6.14': "{{ containerd_package }}-1.6.14-3.1.el{{ ansible_distribution_major_version }}"
'1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
# https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package # https://docs.docker.com/engine/installation/linux/centos/#install-from-a-package
# https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/ # https://download.docker.com/linux/centos/<centos_version>>/x86_64/stable/Packages/

View File

@ -10,8 +10,20 @@ containerd_versioned_pkg:
'1.4.9': "{{ containerd_package }}=1.4.9-1" '1.4.9': "{{ containerd_package }}=1.4.9-1"
'1.4.12': "{{ containerd_package }}=1.4.12-1" '1.4.12': "{{ containerd_package }}=1.4.12-1"
'1.6.4': "{{ containerd_package }}=1.6.4-1" '1.6.4': "{{ containerd_package }}=1.6.4-1"
'stable': "{{ containerd_package }}=1.6.4-1" '1.6.6': "{{ containerd_package }}=1.6.6-1"
'edge': "{{ containerd_package }}=1.6.4-1" '1.6.7': "{{ containerd_package }}=1.6.7-1"
'1.6.8': "{{ containerd_package }}=1.6.8-1"
'1.6.9': "{{ containerd_package }}=1.6.9-1"
'1.6.10': "{{ containerd_package }}=1.6.10-1"
'1.6.11': "{{ containerd_package }}=1.6.11-1"
'1.6.12': "{{ containerd_package }}=1.6.12-1"
'1.6.13': "{{ containerd_package }}=1.6.13-1"
'1.6.14': "{{ containerd_package }}=1.6.14-1"
'1.6.15': "{{ containerd_package }}=1.6.15-1"
'1.6.16': "{{ containerd_package }}=1.6.16-1"
'1.6.18': "{{ containerd_package }}=1.6.18-1"
'stable': "{{ containerd_package }}=1.6.18-1"
'edge': "{{ containerd_package }}=1.6.18-1"
# https://download.docker.com/linux/ubuntu/ # https://download.docker.com/linux/ubuntu/
docker_versioned_pkg: docker_versioned_pkg:

View File

@ -11,8 +11,17 @@ containerd_versioned_pkg:
'1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}" '1.4.12': "{{ containerd_package }}-1.4.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}" '1.6.4': "{{ containerd_package }}-1.6.4-3.1.el{{ ansible_distribution_major_version }}"
'1.6.8': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}" '1.6.8': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}" '1.6.9': "{{ containerd_package }}-1.6.9-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.8-3.1.el{{ ansible_distribution_major_version }}" '1.6.10': "{{ containerd_package }}-1.6.10-3.1.el{{ ansible_distribution_major_version }}"
'1.6.11': "{{ containerd_package }}-1.6.11-3.1.el{{ ansible_distribution_major_version }}"
'1.6.12': "{{ containerd_package }}-1.6.12-3.1.el{{ ansible_distribution_major_version }}"
'1.6.13': "{{ containerd_package }}-1.6.13-3.1.el{{ ansible_distribution_major_version }}"
'1.6.14': "{{ containerd_package }}-1.6.14-3.1.el{{ ansible_distribution_major_version }}"
'1.6.15': "{{ containerd_package }}-1.6.15-3.1.el{{ ansible_distribution_major_version }}"
'1.6.16': "{{ containerd_package }}-1.6.16-3.1.el{{ ansible_distribution_major_version }}"
'1.6.18': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'stable': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
'edge': "{{ containerd_package }}-1.6.18-3.1.el{{ ansible_distribution_major_version }}"
docker_version: 19.03 docker_version: 19.03
docker_cli_version: 19.03 docker_cli_version: 19.03

File diff suppressed because it is too large Load Diff

View File

@ -77,16 +77,16 @@ nerdctl_extra_flags: '{%- if containerd_insecure_registries is defined and conta
# Versions # Versions
kubeadm_version: "{{ kube_version }}" kubeadm_version: "{{ kube_version }}"
crun_version: 1.4.5 crun_version: 1.8.5
runc_version: v1.1.7 runc_version: v1.1.7
kata_containers_version: 2.4.1 kata_containers_version: 3.1.3
youki_version: 0.0.1 youki_version: v0.1.0
gvisor_version: 20210921 gvisor_version: 20230627
containerd_version: 1.7.2 containerd_version: 1.7.2
cri_dockerd_version: 0.3.0 cri_dockerd_version: 0.3.4
# this is relevant when container_manager == 'docker' # this is relevant when container_manager == 'docker'
docker_containerd_version: 1.6.4 docker_containerd_version: 1.6.16
# gcr and kubernetes image repo define # gcr and kubernetes image repo define
gcr_image_repo: "gcr.io" gcr_image_repo: "gcr.io"
@ -120,7 +120,7 @@ weave_version: 2.8.1
pod_infra_version: "3.9" pod_infra_version: "3.9"
cilium_version: "v1.13.4" cilium_version: "v1.13.4"
cilium_cli_version: "v0.14.5" cilium_cli_version: "v0.15.0"
cilium_enable_hubble: false cilium_enable_hubble: false
kube_ovn_version: "v1.11.5" kube_ovn_version: "v1.11.5"
@ -130,7 +130,7 @@ multus_version: "v3.8"
helm_version: "v3.12.1" helm_version: "v3.12.1"
nerdctl_version: "1.4.0" nerdctl_version: "1.4.0"
krew_version: "v0.4.3" krew_version: "v0.4.3"
skopeo_version: v1.10.0 skopeo_version: v1.12.0
# Get kubernetes major version (i.e. 1.17.4 => 1.17) # Get kubernetes major version (i.e. 1.17.4 => 1.17)
kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}" kube_major_version: "{{ kube_version | regex_replace('^v([0-9])+\\.([0-9]+)\\.[0-9]+', 'v\\1.\\2') }}"
@ -169,7 +169,7 @@ crio_download_url: "https://storage.googleapis.com/cri-o/artifacts/cri-o.{{ imag
helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz" helm_download_url: "https://get.helm.sh/helm-{{ helm_version }}-linux-{{ image_arch }}.tar.gz"
runc_download_url: "https://github.com/opencontainers/runc/releases/download/{{ runc_version }}/runc.{{ image_arch }}" runc_download_url: "https://github.com/opencontainers/runc/releases/download/{{ runc_version }}/runc.{{ image_arch }}"
crun_download_url: "https://github.com/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}" crun_download_url: "https://github.com/containers/crun/releases/download/{{ crun_version }}/crun-{{ crun_version }}-linux-{{ image_arch }}"
youki_download_url: "https://github.com/containers/youki/releases/download/v{{ youki_version }}/youki_v{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz" youki_download_url: "https://github.com/containers/youki/releases/download/{{ youki_version }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz"
kata_containers_download_url: "https://github.com/kata-containers/kata-containers/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz" kata_containers_download_url: "https://github.com/kata-containers/kata-containers/releases/download/{{ kata_containers_version }}/kata-static-{{ kata_containers_version }}-{{ ansible_architecture }}.tar.xz"
# gVisor only supports amd64 and uses x86_64 to in the download link # gVisor only supports amd64 and uses x86_64 to in the download link
gvisor_runsc_download_url: "https://storage.googleapis.com/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_architecture }}/runsc" gvisor_runsc_download_url: "https://storage.googleapis.com/gvisor/releases/release/{{ gvisor_version }}/{{ ansible_architecture }}/runsc"
@ -530,7 +530,7 @@ downloads:
file: true file: true
enabled: "{{ youki_enabled }}" enabled: "{{ youki_enabled }}"
version: "{{ youki_version }}" version: "{{ youki_version }}"
dest: "{{ local_release_dir }}/youki_v{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz" dest: "{{ local_release_dir }}/youki_{{ youki_version | regex_replace('\\.', '_') }}_linux.tar.gz"
sha256: "{{ youki_archive_checksum }}" sha256: "{{ youki_archive_checksum }}"
url: "{{ youki_download_url }}" url: "{{ youki_download_url }}"
unarchive: true unarchive: true

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# After a new version of Kubernetes has been released, # After a new version of Kubernetes has been released,
# run this script to update roles/download/defaults/main.yml # run this script to update roles/download/defaults/main/main.yml
# with new hashes. # with new hashes.
import hashlib import hashlib

View File

@ -165,13 +165,13 @@ function get_k8s_checksums {
echo "${binary}_checksums:" | tee --append "$checksums_file" echo "${binary}_checksums:" | tee --append "$checksums_file"
echo " arm:" | tee --append "$checksums_file" echo " arm:" | tee --append "$checksums_file"
for version in "${@:2}"; do for version in "${@:2}"; do
_vercmp "${version#v}" '<' "1.27" && checksum=$(_get_checksum "$binary" "$version" "$arch") || checksum=0 _vercmp "${version#v}" '<' "1.27" && checksum=$(_get_checksum "$binary" "$version" "arm") || checksum=0
echo " ${version#v}: $checksum" | tee --append "$checksums_file" echo " ${version}: $checksum" | tee --append "$checksums_file"
done done
for arch in arm64 amd64 ppc64le; do for arch in arm64 amd64 ppc64le; do
echo " $arch:" | tee --append "$checksums_file" echo " $arch:" | tee --append "$checksums_file"
for version in "${@:2}"; do for version in "${@:2}"; do
echo " ${version#v}: $(_get_checksum "$binary" "$version" "$arch")" | tee --append "$checksums_file" echo " ${version}: $(_get_checksum "$binary" "$version" "$arch")" | tee --append "$checksums_file"
done done
done done
} }
@ -224,9 +224,9 @@ function _get_checksum {
function main { function main {
mkdir -p "$(dirname "$checksums_file")" mkdir -p "$(dirname "$checksums_file")"
echo "---" | tee "$checksums_file" echo "---" | tee "$checksums_file"
get_checksums crictl $(get_versions github_tags kubernetes-sigs/cri-tools) get_checksums crictl $(get_versions github_tags kubernetes-sigs/cri-tools 4)
get_checksums crio_archive $(get_versions github_tags cri-o/cri-o) get_checksums crio_archive $(get_versions github_tags cri-o/cri-o)
kubernetes_versions=$(get_versions github_tags kubernetes/kubernetes 20) kubernetes_versions=$(get_versions github_tags kubernetes/kubernetes 25)
echo "# Checksum" | tee --append "$checksums_file" echo "# Checksum" | tee --append "$checksums_file"
echo "# Kubernetes versions above Kubespray's current target version are untested and should be used with caution." | tee --append "$checksums_file" echo "# Kubernetes versions above Kubespray's current target version are untested and should be used with caution." | tee --append "$checksums_file"
get_k8s_checksums kubelet $kubernetes_versions get_k8s_checksums kubelet $kubernetes_versions