From 807a222e262624b7c9b10aa38265630b193510c0 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Wed, 11 Jun 2025 23:14:09 +0000 Subject: [PATCH] [kubectl] Update utility images for Ubuntu Jammy This PS updates kubectl to 1.33.1 in utility images for Ubuntu Jammy. Change-Id: Ib2914e04d93196b58b6733331f8be7d4a8f3c258 --- images/ceph-utility/Dockerfile.ubuntu_jammy | 2 +- images/compute-utility/Dockerfile.ubuntu_jammy | 2 +- images/etcdctl-utility/Dockerfile.ubuntu_jammy | 2 +- images/mysqlclient-utility/Dockerfile.ubuntu_jammy | 2 +- images/postgresql-utility/Dockerfile.ubuntu_jammy | 5 +++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/images/ceph-utility/Dockerfile.ubuntu_jammy b/images/ceph-utility/Dockerfile.ubuntu_jammy index d8e3eab3..213e1c98 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 # Squid 19.2.1 ARG CEPH_RELEASE=squid ARG CEPH_RELEASE_TAG=19.2.1-1jammy -ARG KUBE_VERSION=1.32.2 +ARG KUBE_VERSION=1.33.1 ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-${CEPH_RELEASE}/ ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-${CEPH_RELEASE}/release.asc diff --git a/images/compute-utility/Dockerfile.ubuntu_jammy b/images/compute-utility/Dockerfile.ubuntu_jammy index 231fcf92..4680142f 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.32.2 +ARG KUBE_VERSION=1.33.1 ARG DEBIAN_FRONTEND=noninteractive diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_jammy b/images/etcdctl-utility/Dockerfile.ubuntu_jammy index 66ddabb6..94a53181 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.32.2 +ARG KUBE_VERSION=1.33.1 ENV GOOGLE_URL=https://storage.googleapis.com/etcd ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download diff --git a/images/mysqlclient-utility/Dockerfile.ubuntu_jammy b/images/mysqlclient-utility/Dockerfile.ubuntu_jammy index 525fffeb..7b71666e 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.32.2 +ARG KUBE_VERSION=1.33.1 ARG MARIADB_VERSION=10.6 ARG PERCONA_TOOLKIT_VERSION=3.5.7 diff --git a/images/postgresql-utility/Dockerfile.ubuntu_jammy b/images/postgresql-utility/Dockerfile.ubuntu_jammy index 10401969..2d8a9fdf 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.32.2 +ARG KUBE_VERSION=1.33.1 ARG DEBIAN_FRONTEND=noninteractive @@ -50,7 +50,8 @@ RUN set -xe \ && rm -rf \ /tmp/* \ /var/cache/debconf/* \ - /var/lib/apt/lists/* + /var/lib/apt/lists/* \ + /etc/ssl/private/ssl-cert-snakeoil.* RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \ && sed -i "/rootwrap_logger.setLevel/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \