airship/porthole
Code Issues Proposed changes

[images] Install the latest rclone package

Browse Source 
+ upgrade k8s and etcd patch versions
+ comment out bionic-related jobs since Portgresql
  doesn't suppport this distribution anymore
The rclone package from upstream repository is obsolete and contains a lot of golang vulnerabilities

Change-Id: I4f1577e7c00c4272ee5216e9f8c8b6ded98dab6f
This commit is contained in:
astebenkova 2023-11-16 16:37:25 +02:00
parent aa66dfafa3
commit 7af0a01b89
6 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
# Quincy 12.2.5
ARG CEPH_RELEASE=quincy
ARG CEPH_RELEASE_TAG=17.2.6-1focal
ARG KUBE_VERSION=1.27.4
ARG KUBE_VERSION=1.27.7
ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-quincy/
ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-quincy/release.asc

2
images/compute-utility/Dockerfile.ubuntu_focal
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.27.4
ARG KUBE_VERSION=1.27.7
ARG DEBIAN_FRONTEND=noninteractive

8
images/etcdctl-utility/Dockerfile.ubuntu_focal
View File

@ -8,8 +8,8 @@ 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 ETCDCTL_VERSION=v3.5.6
ARG KUBE_VERSION=1.27.4
ARG ETCDCTL_VERSION=v3.5.10
ARG KUBE_VERSION=1.27.7
ENV GOOGLE_URL=https://storage.googleapis.com/etcd
ENV GITHUB_URL=https://github.com/etcd-io/etcd/releases/download
@ -33,7 +33,6 @@ RUN set -xe \
python3.8 \
python3-pip \
jq \
rclone \
&& pip3 install --upgrade pip \
&& pip3 install \
munch \
@ -44,8 +43,11 @@ RUN set -xe \
| 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 \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \
&& apt-get install -y --no-install-recommends /tmp/rclone.deb \
&& apt-get clean -y \
&& rm -rf \
/tmp/* \
/var/lib/apt/lists/*
RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \

5
images/mysqlclient-utility/Dockerfile.ubuntu_focal
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.27.4
ARG KUBE_VERSION=1.27.7
RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \
@ -35,7 +35,6 @@ RUN set -xe \
python3.8 \
python3-pip \
jq \
rclone \
&& pip3 install --upgrade pip \
&& pip3 install \
munch \
@ -48,6 +47,8 @@ RUN set -xe \
| tar -zC /usr/bin --strip-components=3 --wildcards -x "*/*/*/kubectl" \
&& curl --silent -L https://downloads.percona.com/downloads/percona-toolkit/3.5.1/binary/tarball/percona-toolkit-3.5.1_x86_64.tar.gz \
| tar -zC /usr/local/bin/ --strip-components=2 --wildcards -x "*/*/pt-show-grants" \
&& curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \
&& apt-get install -y --no-install-recommends /tmp/rclone.deb \
&& rm -rf \
/tmp/* \
/var/cache/debconf/* \

6
images/postgresql-utility/Dockerfile.ubuntu_focal
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.27.4
ARG KUBE_VERSION=1.27.7
RUN set -xe \
&& export DEBIAN_FRONTEND=noninteractive \
@ -31,7 +31,6 @@ RUN set -xe \
python3.8 \
python3-pip \
jq \
rclone \
&& pip3 install --upgrade pip \
&& pip3 install \
munch \
@ -41,7 +40,10 @@ RUN set -xe \
&& apt-get clean -y \
&& 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" \
&& curl -o /tmp/rclone.deb https://downloads.rclone.org/rclone-current-linux-amd64.deb \
&& apt-get install -y --no-install-recommends /tmp/rclone.deb \
&& rm -rf \
/tmp/* \
/var/cache/debconf/* \
/var/lib/apt/lists/*

48
zuul.d/base.yaml
View File

@ -28,15 +28,15 @@
- airship-porthole-images-focal-build-gate-mysqlclient-utility
- airship-porthole-images-focal-build-gate-openstack-utility
- airship-porthole-images-focal-build-gate-postgresql-utility
- airship-porthole-images-bionic-build-gate-calicoctl-utility
- airship-porthole-images-bionic-build-gate-ceph-utility
- airship-porthole-images-bionic-build-gate-compute-utility
- airship-porthole-images-bionic-build-gate-etcdctl-utility
- airship-porthole-images-bionic-build-gate-mysqlclient-utility
- airship-porthole-images-bionic-build-gate-openstack-utility
- airship-porthole-images-bionic-build-gate-postgresql-utility
- airship-porthole-deploy-functional-tests-ubuntu_focal
- airship-porthole-deploy-functional-tests-ubuntu_bionic
# - airship-porthole-images-bionic-build-gate-calicoctl-utility
# - airship-porthole-images-bionic-build-gate-ceph-utility
# - airship-porthole-images-bionic-build-gate-compute-utility
# - airship-porthole-images-bionic-build-gate-etcdctl-utility
# - airship-porthole-images-bionic-build-gate-mysqlclient-utility
# - airship-porthole-images-bionic-build-gate-openstack-utility
# - airship-porthole-images-bionic-build-gate-postgresql-utility
# - airship-porthole-deploy-functional-tests-ubuntu_bionic
gate:
jobs:
@ -52,15 +52,15 @@
- airship-porthole-images-focal-build-gate-mysqlclient-utility
- airship-porthole-images-focal-build-gate-openstack-utility
- airship-porthole-images-focal-build-gate-postgresql-utility
- airship-porthole-images-bionic-build-gate-calicoctl-utility
- airship-porthole-images-bionic-build-gate-ceph-utility
- airship-porthole-images-bionic-build-gate-compute-utility
- airship-porthole-images-bionic-build-gate-etcdctl-utility
- airship-porthole-images-bionic-build-gate-mysqlclient-utility
- airship-porthole-images-bionic-build-gate-openstack-utility
- airship-porthole-images-bionic-build-gate-postgresql-utility
- airship-porthole-deploy-functional-tests-ubuntu_focal
- airship-porthole-deploy-functional-tests-ubuntu_bionic
# - airship-porthole-images-bionic-build-gate-calicoctl-utility
# - airship-porthole-images-bionic-build-gate-ceph-utility
# - airship-porthole-images-bionic-build-gate-compute-utility
# - airship-porthole-images-bionic-build-gate-etcdctl-utility
# - airship-porthole-images-bionic-build-gate-mysqlclient-utility
# - airship-porthole-images-bionic-build-gate-openstack-utility
# - airship-porthole-images-bionic-build-gate-postgresql-utility
# - airship-porthole-deploy-functional-tests-ubuntu_bionic
post:
@ -72,13 +72,13 @@
- airship-porthole-images-publish-mysqlclient-utility
- airship-porthole-images-publish-openstack-utility
- airship-porthole-images-publish-postgresql-utility
- airship-porthole-images-bionic-publish-calicoctl-utility
- airship-porthole-images-bionic-publish-ceph-utility
- airship-porthole-images-bionic-publish-compute-utility
- airship-porthole-images-bionic-publish-etcdctl-utility
- airship-porthole-images-bionic-publish-mysqlclient-utility
- airship-porthole-images-bionic-publish-openstack-utility
- airship-porthole-images-bionic-publish-postgresql-utility
# - airship-porthole-images-bionic-publish-calicoctl-utility
# - airship-porthole-images-bionic-publish-ceph-utility
# - airship-porthole-images-bionic-publish-compute-utility
# - airship-porthole-images-bionic-publish-etcdctl-utility
# - airship-porthole-images-bionic-publish-mysqlclient-utility
# - airship-porthole-images-bionic-publish-openstack-utility
# - airship-porthole-images-bionic-publish-postgresql-utility
- nodeset:
@ -239,4 +239,4 @@
Vlpomy02Nj4PkZZDKY7Eo3uf/+3aa8/hhvJursqv6VvqwYl75euT8Immo1EUw/Hw4PBpJ
JXcwlGoK6kvXmYaG2c7yEiH2xNtTzVTai10fsalubQWR4FTmJA5LU9+HatHBa46XLy4gS
vMHs2uJudmxhqLIhs5Er248FVjfxw7le5dPun3ir4J7Mjgypu5y8eLCMZAFIwpeqlJrVU
uih8ByaTlSEh6FBzle7Hb330RjSztC4pX6xiNAmtkpxhF2rEEFS66B/ixwCphQ=
uih8ByaTlSEh6FBzle7Hb330RjSztC4pX6xiNAmtkpxhF2rEEFS66B/ixwCphQ=