From bd95b13d2b0f241a9320a2862277440ed9efade5 Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 17 Aug 2023 16:48:51 +0000 Subject: [PATCH] Porthole updates This PS makes the follofing changes: - adds iproute2 package to compute-utility - kubectl updated to 1.27.4 in focal images - if available - mounts 80Gb volume in zuul nodes for docker and containerd - runs local docker registry and let's containerd to pull locally built images for tests Change-Id: I09faace44f68bf0d75a6f4272006cb36e02314d4 --- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- .../images-ubuntu_bionic.yaml | 2 +- .../values_overrides/images-ubuntu_focal.yaml | 2 +- images/ceph-utility/Dockerfile.ubuntu_focal | 2 +- .../compute-utility/Dockerfile.ubuntu_focal | 3 ++- .../etcdctl-utility/Dockerfile.ubuntu_focal | 2 +- .../Dockerfile.ubuntu_focal | 2 +- .../Dockerfile.ubuntu_focal | 2 +- tools/deployment/004-make-images.sh | 26 ++++++++++++++++++- .../airship-porthole-gate-runner.yaml | 10 +++++++ tools/gate/playbooks/docker-image-build.yaml | 1 - tools/helm_install.sh | 2 +- 23 files changed, 56 insertions(+), 22 deletions(-) diff --git a/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml index c2a1af1b..3252d9a0 100644 --- a/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/calicoctl-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_bionic + calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml b/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml index 8f156336..b666b6d8 100644 --- a/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/calicoctl-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - calicoctl_utility: quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_focal + calicoctl_utility: localhost:5000/porthole-calicoctl-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml index 2e463c38..40f6be3d 100644 --- a/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/ceph-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - ceph_utility: quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_bionic + ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml b/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml index 42503864..c6a0b44e 100644 --- a/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/ceph-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - ceph_utility: quay.io/airshipit/porthole-ceph-utility:latest-ubuntu_focal + ceph_utility: localhost:5000/porthole-ceph-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml index f6c79aa0..e1bcbcd4 100644 --- a/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/compute-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - compute_utility: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_bionic + compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml b/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml index c7595ee2..1be7a594 100644 --- a/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/compute-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - compute_utility: quay.io/airshipit/porthole-compute-utility:latest-ubuntu_focal + compute_utility: localhost:5000/porthole-compute-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml index 8aa82732..003c43a8 100644 --- a/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/etcdctl-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_bionic + etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml b/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml index 08ffa17c..5d6d7c24 100644 --- a/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/etcdctl-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - etcdctl_utility: quay.io/airshipit/porthole-etcdctl-utility:latest-ubuntu_focal + etcdctl_utility: localhost:5000/porthole-etcdctl-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml index 39eab710..4c807d08 100644 --- a/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/mysqlclient-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic + mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml b/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml index 1072879f..d794bcac 100644 --- a/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/mysqlclient-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - mysqlclient_utility: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal + mysqlclient_utility: localhost:5000/porthole-mysqlclient-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml index 0bf72d72..4fe95227 100644 --- a/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/openstack-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - openstack_utility: quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_bionic + openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml b/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml index 942f99c9..689e252b 100644 --- a/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/openstack-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - openstack_utility: quay.io/airshipit/porthole-openstack-utility:latest-ubuntu_focal + openstack_utility: localhost:5000/porthole-openstack-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml b/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml index f6ee9f91..1bc6b163 100644 --- a/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml +++ b/charts/postgresql-utility/values_overrides/images-ubuntu_bionic.yaml @@ -1,5 +1,5 @@ --- images: tags: - postgresql_utility: quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_bionic + postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_bionic ... \ No newline at end of file diff --git a/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml b/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml index 368428f5..45168bd2 100644 --- a/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml +++ b/charts/postgresql-utility/values_overrides/images-ubuntu_focal.yaml @@ -1,5 +1,5 @@ --- images: tags: - postgresql_utility: quay.io/airshipit/porthole-postgresql-utility:latest-ubuntu_focal + postgresql_utility: localhost:5000/porthole-postgresql-utility:latest-ubuntu_focal ... \ No newline at end of file diff --git a/images/ceph-utility/Dockerfile.ubuntu_focal b/images/ceph-utility/Dockerfile.ubuntu_focal index 75904c07..99278727 100755 --- a/images/ceph-utility/Dockerfile.ubuntu_focal +++ b/images/ceph-utility/Dockerfile.ubuntu_focal @@ -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.1 +ARG KUBE_VERSION=1.27.4 ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-quincy/ ARG CEPH_KEY=https://mirror.mirantis.com/acicd/ceph-quincy/release.asc diff --git a/images/compute-utility/Dockerfile.ubuntu_focal b/images/compute-utility/Dockerfile.ubuntu_focal index 86729f3f..a499ef96 100755 --- a/images/compute-utility/Dockerfile.ubuntu_focal +++ b/images/compute-utility/Dockerfile.ubuntu_focal @@ -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.1 +ARG KUBE_VERSION=1.27.4 ARG DEBIAN_FRONTEND=noninteractive @@ -24,6 +24,7 @@ RUN set -xe \ gnupg \ hexedit \ iperf \ + iproute2 \ jq \ moreutils \ radosgw \ diff --git a/images/etcdctl-utility/Dockerfile.ubuntu_focal b/images/etcdctl-utility/Dockerfile.ubuntu_focal index dd90fda9..f4af7995 100644 --- a/images/etcdctl-utility/Dockerfile.ubuntu_focal +++ b/images/etcdctl-utility/Dockerfile.ubuntu_focal @@ -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.5.6 -ARG KUBE_VERSION=1.27.1 +ARG KUBE_VERSION=1.27.4 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_focal b/images/mysqlclient-utility/Dockerfile.ubuntu_focal index 9ecefd08..3fe74da3 100644 --- a/images/mysqlclient-utility/Dockerfile.ubuntu_focal +++ b/images/mysqlclient-utility/Dockerfile.ubuntu_focal @@ -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.1 +ARG KUBE_VERSION=1.27.4 RUN set -xe \ && export DEBIAN_FRONTEND=noninteractive \ diff --git a/images/postgresql-utility/Dockerfile.ubuntu_focal b/images/postgresql-utility/Dockerfile.ubuntu_focal index 66f80e27..42e96a82 100644 --- a/images/postgresql-utility/Dockerfile.ubuntu_focal +++ b/images/postgresql-utility/Dockerfile.ubuntu_focal @@ -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.1 +ARG KUBE_VERSION=1.27.4 RUN set -xe \ && export DEBIAN_FRONTEND=noninteractive \ diff --git a/tools/deployment/004-make-images.sh b/tools/deployment/004-make-images.sh index 7a5faf3c..86e0c8f8 100755 --- a/tools/deployment/004-make-images.sh +++ b/tools/deployment/004-make-images.sh @@ -13,5 +13,29 @@ set -x + + : "${DISTRO="ubuntu_focal"}" + env -make images \ No newline at end of file +make images + +docker rm registry --force || true +docker run -d -p 5000:5000 --restart=always --name registry registry:2 + +docker tag quay.io/airshipit/porthole-calicoctl-utility:latest-${DISTRO} localhost:5000/porthole-calicoctl-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-ceph-utility:latest-${DISTRO} localhost:5000/porthole-ceph-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-compute-utility:latest-${DISTRO} localhost:5000/porthole-compute-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-etcdctl-utility:latest-${DISTRO} localhost:5000/porthole-etcdctl-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-mysqlclient-utility:latest-${DISTRO} localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-openstack-utility:latest-${DISTRO} localhost:5000/porthole-openstack-utility:latest-${DISTRO} +docker tag quay.io/airshipit/porthole-postgresql-utility:latest-${DISTRO} localhost:5000/porthole-postgresql-utility:latest-${DISTRO} + + + +docker push localhost:5000/porthole-calicoctl-utility:latest-${DISTRO} +docker push localhost:5000/porthole-ceph-utility:latest-${DISTRO} +docker push localhost:5000/porthole-compute-utility:latest-${DISTRO} +docker push localhost:5000/porthole-etcdctl-utility:latest-${DISTRO} +docker push localhost:5000/porthole-mysqlclient-utility:latest-${DISTRO} +docker push localhost:5000/porthole-openstack-utility:latest-${DISTRO} +docker push localhost:5000/porthole-postgresql-utility:latest-${DISTRO} \ No newline at end of file diff --git a/tools/gate/playbooks/airship-porthole-gate-runner.yaml b/tools/gate/playbooks/airship-porthole-gate-runner.yaml index 8419634f..39989814 100644 --- a/tools/gate/playbooks/airship-porthole-gate-runner.yaml +++ b/tools/gate/playbooks/airship-porthole-gate-runner.yaml @@ -24,6 +24,16 @@ set -x ./tools/deployment/000-install-packages.sh ./tools/deployment/002-build-charts.sh + sudo fdisk --list + df -h + sudo mkdir -p /opt/ext_vol + BIG_VOLUME=$(sudo fdisk -l 2>&1 | grep -E 80G | grep Linux | awk '{print $1}') + if ! mount | grep "${BIG_VOLUME}" + then + sudo mkfs.ext4 "${BIG_VOLUME}" + sudo mount "${BIG_VOLUME}" /opt/ext_vol + df -h + fi ./tools/deployment/003-deploy-k8s.sh ./tools/deployment/004-make-images.sh args: diff --git a/tools/gate/playbooks/docker-image-build.yaml b/tools/gate/playbooks/docker-image-build.yaml index 272bf64f..a30f853c 100644 --- a/tools/gate/playbooks/docker-image-build.yaml +++ b/tools/gate/playbooks/docker-image-build.yaml @@ -58,7 +58,6 @@ executable: pip3 become: True - - name: Make images when: not publish block: diff --git a/tools/helm_install.sh b/tools/helm_install.sh index 89fd96e6..b3b1ca37 100755 --- a/tools/helm_install.sh +++ b/tools/helm_install.sh @@ -17,7 +17,7 @@ set -x HELM=$1 -HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.11.1-linux-amd64.tar.gz"} +HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz"} function install_helm_binary {