airship/porthole
Code Issues Proposed changes

Upgrade Kubernetes to version 1.21.7

Browse Source 
Updated Kubernetes for Ceph, Compute, etcdctl, MySQL
and Postgres Utility Containers to 1.21.7. Also
upgraded ceph to 15.2.15-1bionic.

Change-Id: Iebb25e9bac6a7592296255c3cb260bdacdd769f6
This commit is contained in:
Jagan Mohan Kavva 2021-11-22 07:17:52 -06:00
parent 96de95fa2c
commit ab8fcb5fff
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/calicoctl-utility/Dockerfile.ubuntu_bionic
View File

@ -32,7 +32,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==5.8.0 \
oslo.rootwrap==6.0.2 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

2
images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
View File

@ -38,7 +38,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==5.8.0 \
oslo.rootwrap==6.0.2 \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

8
images/ceph-utility/Dockerfile.ubuntu_bionic
View File

@ -8,10 +8,10 @@ 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'
# octopus 15.2.13-1bionic
# octopus 15.2.15-1bionic
ARG CEPH_RELEASE=octopus
ARG CEPH_RELEASE_TAG=15.2.8-1.0~bionic
ARG KUBE_VERSION=1.20.9
ARG CEPH_RELEASE_TAG=15.2.15-1bionic
ARG KUBE_VERSION=1.21.7
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-octopus/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-octopus/release.asc
@ -48,7 +48,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==5.8.0 \
oslo.rootwrap==6.0.2 \
&& apt-get remove --purge -y wget apt-transport-https \
&& apt-get autoremove -y \
&& apt-get clean \

4
images/compute-utility/Dockerfile.ubuntu_bionic
View File

@ -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.20.9
ARG KUBE_VERSION=1.21.7
ARG DEBIAN_FRONTEND=noninteractive
@ -37,7 +37,7 @@ RUN set -xe \
python3-pip \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==5.8.0 \
oslo.rootwrap==6.0.2 \
&& apt-get remove --purge -y wget apt-transport-https \
&& apt-get autoremove -y \
&& apt-get clean \

6
images/etcdctl-utility/Dockerfile.ubuntu_bionic
View File

@ -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.16
ARG KUBE_VERSION=1.20.9
ARG KUBE_VERSION=1.21.7
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download
@ -36,8 +36,8 @@ RUN set -xe \
rclone \
&& pip3 install --upgrade pip \
&& pip3 install \
oslo.rootwrap==5.8.0 \
python-openstackclient==3.18.1 \
oslo.rootwrap==6.0.2 \
python-openstackclient==5.2.0 \
python-swiftclient \
&& curl --silent -L "${DOWNLOAD_URL}/${ETCDCTL_VERSION}/etcd-${ETCDCTL_VERSION}-linux-amd64.tar.gz" \
| tar -zC /usr/local/bin --strip-components=1 --wildcards -x "*/etcdctl" \

2
images/mysqlclient-utility/Dockerfile.ubuntu_bionic
View File

@ -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.20.9
ARG KUBE_VERSION=1.21.7
RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \

2
images/postgresql-utility/Dockerfile.ubuntu_bionic
View File

@ -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/ussuri
ARG KUBE_VERSION=1.20.9
ARG KUBE_VERSION=1.21.7
RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \