From ab8fcb5fffe7485a447dc60ad8bf6ed319789f45 Mon Sep 17 00:00:00 2001 From: Jagan Mohan Kavva Date: Mon, 22 Nov 2021 07:17:52 -0600 Subject: [PATCH] Upgrade Kubernetes to version 1.21.7 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 --- images/calicoctl-utility/Dockerfile.ubuntu_bionic | 2 +- .../Dockerfile_calicoq_calicoctl.ubuntu_bionic | 2 +- images/ceph-utility/Dockerfile.ubuntu_bionic | 8 ++++---- images/compute-utility/Dockerfile.ubuntu_bionic | 4 ++-- images/etcdctl-utility/Dockerfile.ubuntu_bionic | 6 +++--- images/mysqlclient-utility/Dockerfile.ubuntu_bionic | 2 +- images/postgresql-utility/Dockerfile.ubuntu_bionic | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/images/calicoctl-utility/Dockerfile.ubuntu_bionic b/images/calicoctl-utility/Dockerfile.ubuntu_bionic index 761ac180..b2edcd85 100644 --- a/images/calicoctl-utility/Dockerfile.ubuntu_bionic +++ b/images/calicoctl-utility/Dockerfile.ubuntu_bionic @@ -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/* diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic index c123bbf1..dd2fa026 100644 --- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic +++ b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic @@ -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/* diff --git a/images/ceph-utility/Dockerfile.ubuntu_bionic b/images/ceph-utility/Dockerfile.ubuntu_bionic index bfd55327..1db163ca 100755 --- a/images/ceph-utility/Dockerfile.ubuntu_bionic +++ b/images/ceph-utility/Dockerfile.ubuntu_bionic @@ -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 \ diff --git a/images/compute-utility/Dockerfile.ubuntu_bionic b/images/compute-utility/Dockerfile.ubuntu_bionic index e565bcf7..1e50d60a 100755 --- a/images/compute-utility/Dockerfile.ubuntu_bionic +++ b/images/compute-utility/Dockerfile.ubuntu_bionic @@ -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 \ diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_bionic b/images/etcdctl-utility/Dockerfile.ubuntu_bionic index f523e4ba..bd66c0b6 100644 --- a/images/etcdctl-utility/Dockerfile.ubuntu_bionic +++ b/images/etcdctl-utility/Dockerfile.ubuntu_bionic @@ -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" \ diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_bionic b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic index 19960e70..70c4c1f0 100644 --- a/images/mysqlclient-utility/Dockerfile.ubuntu_bionic +++ b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic @@ -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 \ diff --git a/images/postgresql-utility/Dockerfile.ubuntu_bionic b/images/postgresql-utility/Dockerfile.ubuntu_bionic index 28b28faa..e33575ce 100644 --- a/images/postgresql-utility/Dockerfile.ubuntu_bionic +++ b/images/postgresql-utility/Dockerfile.ubuntu_bionic @@ -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 \