openstack
/
magnum
Code Issues Proposed changes

Merge "Download correct cri-containerd-cni tarball"

This commit is contained in:
Zuul 2021-04-01 12:07:40 +00:00 committed by Gerrit Code Review
parent e9b4889670 1de9b140f4
commit 20413d0c45
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/user/index.rst
View File

@ -1597,13 +1597,15 @@ _`containerd_version`
The containerd version to use as released in The containerd version to use as released in
https://github.com/containerd/containerd/releases and https://github.com/containerd/containerd/releases and
https://storage.googleapis.com/cri-containerd-release/ https://storage.googleapis.com/cri-containerd-release/
Victoria default: 1.4.4
Ussuri default: 1.2.8
_`containerd_tarball_url` _`containerd_tarball_url`
Url with the tarball of containerd's binaries. Url with the tarball of containerd's binaries.
_`containerd_tarball_sha256` _`containerd_tarball_sha256`
sha256 of the tarball fetched with containerd_tarball_url or from sha256 of the tarball fetched with containerd_tarball_url or from
https://storage.googleapis.com/cri-containerd-release/. https://github.com/containerd/containerd/releases.
_`kube_dashboard_version` _`kube_dashboard_version`
Default version of Kubernetes dashboard. Default version of Kubernetes dashboard.

2
magnum/drivers/common/templates/kubernetes/fragments/install-cri.sh
View File

@ -10,7 +10,7 @@ ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then if [ "${CONTAINER_RUNTIME}" = "containerd" ] ; then
$ssh_cmd systemctl disable docker $ssh_cmd systemctl disable docker
if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then if [ -z "${CONTAINERD_TARBALL_URL}" ] ; then
CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/containerd-${CONTAINERD_VERSION}-linux-amd64.tar.gz" CONTAINERD_TARBALL_URL="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/cri-containerd-cni-${CONTAINERD_VERSION}-linux-amd64.tar.gz"
fi fi
i=0 i=0
until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}" until curl -o /srv/magnum/cri-containerd.tar.gz -L "${CONTAINERD_TARBALL_URL}"

6
magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml
View File

@ -939,8 +939,8 @@ parameters:
containerd_version: containerd_version:
type: string type: string
description: The containerd version to download from https://storage.googleapis.com/cri-containerd-release/ description: The containerd version to download from https://github.com/containerd/containerd/releases
default: '1.4.3' default: '1.4.4'
containerd_tarball_url: containerd_tarball_url:
type: string type: string
@ -950,7 +950,7 @@ parameters:
containerd_tarball_sha256: containerd_tarball_sha256:
type: string type: string
description: sha256 of the target containerd tarball. description: sha256 of the target containerd tarball.
default: '34a161e3f459fd337b03141a339eeb1a56c5c811922fe72012d2dac9fa5542f1' default: '96641849cb78a0a119223a427dfdc1ade88412ef791a14193212c8c8e29d447b'
post_install_manifest_url: post_install_manifest_url:
type: string type: string

6
magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml
View File

@ -957,8 +957,8 @@ parameters:
containerd_version: containerd_version:
type: string type: string
description: The containerd version to download from https://storage.googleapis.com/cri-containerd-release/ description: The containerd version to download from https://github.com/containerd/containerd/releases
default: '1.2.8' default: '1.4.4'
containerd_tarball_url: containerd_tarball_url:
type: string type: string
@ -968,7 +968,7 @@ parameters:
containerd_tarball_sha256: containerd_tarball_sha256:
type: string type: string
description: sha256 of the target containerd tarball. description: sha256 of the target containerd tarball.
default: '1f2f0fb928179df90492a83c326a194b8e9d992538498efb44cbb6ef15465627' default: '96641849cb78a0a119223a427dfdc1ade88412ef791a14193212c8c8e29d447b'
post_install_manifest_url: post_install_manifest_url:
type: string type: string