airship/porthole
Code Issues Proposed changes

Fixed swiftclient and updated kubeclient

Browse Source 
Added simplejson module for openstack container
command to work with swiftclient

Also bumped all kubectl versions to 1.31.0

Change-Id: I30a160fa8d352f2e0d0c544991159c672b190381
This commit is contained in:
Sergiy Markin 2024-09-19 20:27:20 +00:00
parent 272cc95fde
commit 2ddd25489a
6 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
images/ceph-utility/Dockerfile.ubuntu_jammy
View File

@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
# Reef 18.2.2 # Reef 18.2.2
ARG CEPH_RELEASE=reef ARG CEPH_RELEASE=reef
ARG CEPH_RELEASE_TAG=18.2.2-1~jammy 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_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 ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph/debian-18.2.2.patch1/jammy/release.asc

2
images/compute-utility/Dockerfile.ubuntu_jammy
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.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.29.7 ARG KUBE_VERSION=1.31.0
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive

11
images/etcdctl-utility/Dockerfile.ubuntu_jammy
View File

@ -9,7 +9,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG ETCDCTL_VERSION=3.5.12 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 GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download
@ -37,10 +37,11 @@ RUN set -xe \
orphan-sysvinit-scripts \ orphan-sysvinit-scripts \
&& curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \
&& pip3 install --no-cache-dir \ && pip3 install --no-cache-dir \
munch \ munch \
oslo.rootwrap==7.0.1 \ simplejson \
python-openstackclient==6.2.0 \ oslo.rootwrap==7.0.1 \
python-swiftclient==4.2.0 \ 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" \ && 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" \ | 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 \ && curl --silent -L https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \

11
images/mysqlclient-utility/Dockerfile.ubuntu_jammy
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.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' 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 MARIADB_VERSION=10.6
ARG PERCONA_TOOLKIT_VERSION=3.5.7 ARG PERCONA_TOOLKIT_VERSION=3.5.7
@ -43,10 +43,11 @@ RUN set -xe \
orphan-sysvinit-scripts \ orphan-sysvinit-scripts \
&& curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \
&& pip3 install --no-cache-dir \ && pip3 install --no-cache-dir \
munch \ munch \
oslo.rootwrap==7.0.1 \ simplejson \
python-openstackclient==6.2.0 \ oslo.rootwrap==7.0.1 \
python-swiftclient==4.2.0 \ python-openstackclient==6.2.0 \
python-swiftclient==4.2.0 \
&& sed -i 's/$PrivDropToUser syslog/$PrivDropToUser nobody/' /etc/rsyslog.conf \ && 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 \ && 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" \ | tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \

2
images/openstack-utility/Dockerfile.ubuntu_jammy
View File

@ -26,6 +26,7 @@ RUN set -xe \
&& curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \
&& pip3 install --no-cache-dir \ && pip3 install --no-cache-dir \
munch \ munch \
simplejson \
oslo.rootwrap==7.0.1 \ oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \ python-openstackclient==6.2.0 \
python-glanceclient==4.3.0 \ python-glanceclient==4.3.0 \
@ -33,6 +34,7 @@ RUN set -xe \
python-neutronclient==9.0.0 \ python-neutronclient==9.0.0 \
python-cinderclient==9.3.0 \ python-cinderclient==9.3.0 \
python-heatclient==3.2.0 \ python-heatclient==3.2.0 \
python-swiftclient==4.2.0 \
osc-placement \ osc-placement \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

3
images/postgresql-utility/Dockerfile.ubuntu_jammy
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.vendor='The Airship Authors' \
org.opencontainers.image.licenses='Apache-2.0' org.opencontainers.image.licenses='Apache-2.0'
ARG KUBE_VERSION=1.29.7 ARG KUBE_VERSION=1.31.0
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
@ -39,6 +39,7 @@ RUN set -xe \
&& curl -s https://bootstrap.pypa.io/get-pip.py | python3 \ && curl -s https://bootstrap.pypa.io/get-pip.py | python3 \
&& pip3 install --no-cache-dir \ && pip3 install --no-cache-dir \
munch \ munch \
simplejson \
oslo.rootwrap==7.0.1 \ oslo.rootwrap==7.0.1 \
python-openstackclient==6.2.0 \ python-openstackclient==6.2.0 \
python-swiftclient==4.2.0 \ python-swiftclient==4.2.0 \