Upgrade Kubernetes to 1.20
Upgrade Kubernetes (kubectl) for Ceph, Compute, etcdctl, MySQL and Postgres Utility Containers to 1.20. Change-Id: Ie9a67ed6bbccd8e561a019fe14044c203ba00580
This commit is contained in:
parent
0816edd51d
commit
90de383a70
|
@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
|
|||
# octopus 15.2.13-1bionic
|
||||
ARG CEPH_RELEASE=octopus
|
||||
ARG CEPH_RELEASE_TAG=15.2.13-1bionic
|
||||
ARG KUBE_VERSION=1.18.6
|
||||
ARG KUBE_VERSION=1.20.0
|
||||
|
||||
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-octopus/
|
||||
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-octopus/release.asc
|
||||
|
|
|
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
|
|||
org.opencontainers.image.vendor='The Airship Authors' \
|
||||
org.opencontainers.image.licenses='Apache-2.0'
|
||||
|
||||
ARG KUBE_VERSION=1.18.6
|
||||
ARG KUBE_VERSION=1.20.0
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
|
|||
org.opencontainers.image.licenses='Apache-2.0'
|
||||
|
||||
ARG ETCDCTL_VERSION=v3.4.3
|
||||
ARG KUBE_VERSION=1.18.6
|
||||
ARG KUBE_VERSION=1.20.0
|
||||
|
||||
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
|
||||
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download
|
||||
|
|
|
@ -8,7 +8,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
|
|||
org.opencontainers.image.vendor='The Airship Authors' \
|
||||
org.opencontainers.image.licenses='Apache-2.0'
|
||||
|
||||
ARG KUBE_VERSION=1.18.6
|
||||
ARG KUBE_VERSION=1.20.0
|
||||
|
||||
RUN set -xe \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
|
|
|
@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
|
|||
org.opencontainers.image.licenses='Apache-2.0'
|
||||
|
||||
ARG UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/train
|
||||
ARG KUBE_VERSION=1.18.6
|
||||
ARG KUBE_VERSION=1.20.0
|
||||
|
||||
RUN set -xe \
|
||||
&& export DEBIAN_FRONTEND=noninteractive \
|
||||
|
@ -28,9 +28,11 @@ RUN set -xe \
|
|||
python3.6 \
|
||||
python3-pip \
|
||||
jq \
|
||||
rclone \
|
||||
&& pip3 install --upgrade pip \
|
||||
&& pip3 install -c ${UPPER_CONSTRAINTS_FILE} \
|
||||
oslo.rootwrap==5.8.0 \
|
||||
python-openstackclient==4.0.1 \
|
||||
oslo.rootwrap==5.16.1 \
|
||||
python-openstackclient==4.0.2 \
|
||||
python-swiftclient \
|
||||
&& apt-get clean -y \
|
||||
&& curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
|
||||
|
|
|
@ -24,7 +24,7 @@ SERVE_DIR=$(mktemp -d)
|
|||
|
||||
HTK_STABLE_COMMIT=${HTK_COMMIT:-"4fe6212dad6e3f07d43122485d60ab8f38642293"}
|
||||
|
||||
${HELM} init --client-only
|
||||
${HELM} init --client-only --skip-refresh --stable-repo-url "https://charts.helm.sh/stable"
|
||||
|
||||
if [[ -s ${HELM_PIDFILE} ]]; then
|
||||
HELM_PID=$(cat "${HELM_PIDFILE}")
|
||||
|
|
Loading…
Reference in New Issue