From 2ddd25489a782675bbeaf723bb1442d757fe0cb3 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 19 Sep 2024 20:27:20 +0000 Subject: [PATCH] Fixed swiftclient and updated kubeclient Added simplejson module for openstack container command to work with swiftclient Also bumped all kubectl versions to 1.31.0 Change-Id: I30a160fa8d352f2e0d0c544991159c672b190381 --- images/ceph-utility/Dockerfile.ubuntu_jammy | 2 +- images/compute-utility/Dockerfile.ubuntu_jammy | 2 +- images/etcdctl-utility/Dockerfile.ubuntu_jammy | 11 ++++++----- images/mysqlclient-utility/Dockerfile.ubuntu_jammy | 11 ++++++----- images/openstack-utility/Dockerfile.ubuntu_jammy | 2 ++ images/postgresql-utility/Dockerfile.ubuntu_jammy | 3 ++- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/images/ceph-utility/Dockerfile.ubuntu_jammy b/images/ceph-utility/Dockerfile.ubuntu_jammy index 1d35079a..1029f495 100644 --- a/images/ceph-utility/Dockerfile.ubuntu_jammy +++ b/images/ceph-utility/Dockerfile.ubuntu_jammy @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc # Reef 18.2.2 ARG CEPH_RELEASE=reef ARG CEPH_RELEASE_TAG=18.2.2-1~jammy -ARG KUBE_VERSION=1.29.7 +ARG KUBE_VERSION=1.31.0 ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph/debian-18.2.2.patch1/jammy/ ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph/debian-18.2.2.patch1/jammy/release.asc diff --git a/images/compute-utility/Dockerfile.ubuntu_jammy b/images/compute-utility/Dockerfile.ubuntu_jammy index 04834b3c..c704c5d4 100644 --- a/images/compute-utility/Dockerfile.ubuntu_jammy +++ b/images/compute-utility/Dockerfile.ubuntu_jammy @@ -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.29.7 +ARG KUBE_VERSION=1.31.0 ARG DEBIAN_FRONTEND=noninteractive diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_jammy b/images/etcdctl-utility/Dockerfile.ubuntu_jammy index 1313e520..29eb2a6d 100644 --- a/images/etcdctl-utility/Dockerfile.ubuntu_jammy +++ b/images/etcdctl-utility/Dockerfile.ubuntu_jammy @@ -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=3.5.12 -ARG KUBE_VERSION=1.29.7 +ARG KUBE_VERSION=1.31.0 ENV GOOGLE_URL=https://storage.googleapis.com/etcd ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download @@ -37,10 +37,11 @@ RUN set -xe \ orphan-sysvinit-scripts \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir \ - munch \ - oslo.rootwrap==7.0.1 \ - python-openstackclient==6.2.0 \ - python-swiftclient==4.2.0 \ + munch \ + simplejson \ + oslo.rootwrap==7.0.1 \ + python-openstackclient==6.2.0 \ + python-swiftclient==4.2.0 \ && curl --silent -L "${DOWNLOAD_URL}/v${ETCDCTL_VERSION}/etcd-v${ETCDCTL_VERSION}-linux-amd64.tar.gz" \ | tar -zC /usr/local/bin --strip-components=1 --wildcards -x "*/etcdctl" \ && curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \ diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_jammy b/images/mysqlclient-utility/Dockerfile.ubuntu_jammy index 3462501f..d49e09e2 100644 --- a/images/mysqlclient-utility/Dockerfile.ubuntu_jammy +++ b/images/mysqlclient-utility/Dockerfile.ubuntu_jammy @@ -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.29.7 +ARG KUBE_VERSION=1.31.0 ARG MARIADB_VERSION=10.6 ARG PERCONA_TOOLKIT_VERSION=3.5.7 @@ -43,10 +43,11 @@ RUN set -xe \ orphan-sysvinit-scripts \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir \ - munch \ - oslo.rootwrap==7.0.1 \ - python-openstackclient==6.2.0 \ - python-swiftclient==4.2.0 \ + munch \ + simplejson \ + oslo.rootwrap==7.0.1 \ + python-openstackclient==6.2.0 \ + python-swiftclient==4.2.0 \ && sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf \ && curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \ | tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \ diff --git a/images/openstack-utility/Dockerfile.ubuntu_jammy b/images/openstack-utility/Dockerfile.ubuntu_jammy index 1825411c..86447296 100644 --- a/images/openstack-utility/Dockerfile.ubuntu_jammy +++ b/images/openstack-utility/Dockerfile.ubuntu_jammy @@ -26,6 +26,7 @@ RUN set -xe \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir \ munch \ + simplejson \ oslo.rootwrap==7.0.1 \ python-openstackclient==6.2.0 \ python-glanceclient==4.3.0 \ @@ -33,6 +34,7 @@ RUN set -xe \ python-neutronclient==9.0.0 \ python-cinderclient==9.3.0 \ python-heatclient==3.2.0 \ + python-swiftclient==4.2.0 \ osc-placement \ && rm -rf /var/lib/apt/lists/* diff --git a/images/postgresql-utility/Dockerfile.ubuntu_jammy b/images/postgresql-utility/Dockerfile.ubuntu_jammy index a44264ad..9940dab9 100644 --- a/images/postgresql-utility/Dockerfile.ubuntu_jammy +++ b/images/postgresql-utility/Dockerfile.ubuntu_jammy @@ -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.29.7 +ARG KUBE_VERSION=1.31.0 ARG DEBIAN_FRONTEND=noninteractive @@ -39,6 +39,7 @@ RUN set -xe \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir \ munch \ + simplejson \ oslo.rootwrap==7.0.1 \ python-openstackclient==6.2.0 \ python-swiftclient==4.2.0 \