[images] Upgrade distro version to Ubuntu Focal

Add focal-based docker recipes for porthole images. Besides, amend helm charts and zuul variables related to distribution. Change-Id: I1a6ac464a115a842dd7010fa8a28fbe0822b9598
2023-01-13 12:52:00 +02:00 · 2023-01-13 12:52:00 +02:00 · 91d35fc47f
commit 91d35fc47f
parent fa49a102c9
22 changed files with 50 additions and 47 deletions
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@ -239,4 +239,4 @@ manifests:
  configmap_etc_client: true
  deployment_calicoctl_utility: true
  job_image_repo_sync: false
-  secret_certificates: false
+  secret_certificates: false
--- a/charts/ceph-utility/values.yaml
+++ b/charts/ceph-utility/values.yaml
@ -196,4 +196,4 @@ manifests:
  configmap_etc_client: true
  configmap_etc_sudoers: true
  deployment_utility: true
-  network_policy: false
+  network_policy: false
--- a/charts/compute-utility/values.yaml
+++ b/charts/compute-utility/values.yaml
@ -166,4 +166,4 @@ manifests:
  configmap_bin: true
  configmap_etc_client: true
  configmap_etc_sudoers: true
-  deployment_utility: true
+  deployment_utility: true
--- a/charts/mysqlclient-utility/values.yaml
+++ b/charts/mysqlclient-utility/values.yaml
@ -19,7 +19,7 @@ release_group: null

 images:
  tags:
-    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
+    mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_bionic
    mysqlclient_utility: 'quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic'
    image_repo_sync: docker.io/docker:18.09.02
  pull_policy: IfNotPresent
--- a/images/calicoctl-utility/Dockerfile.ubuntu_bionic
+++ b/images/calicoctl-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 ARG DOCKER_REGISTRY=quay.io
 ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
 ARG CALICOCTL_VERSION=v3.23.1
@ -21,14 +21,14 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
 RUN set -xe \
    && sed -i '/nobody/d' /etc/passwd \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y --no-install-recommends \
       bash \
       locales \
       moreutils \
       sudo \
       socat \
-       python3.6 \
+       python3.8 \
       python3-pip \
    && pip3 install --upgrade pip \
    && pip3 install \
--- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
+++ b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 ARG DOCKER_REGISTRY=quay.io
 ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
 ARG CALICOCTL_VERSION=v3.23.1
@ -27,14 +27,14 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
 RUN set -xe \
    && sed -i '/nobody/d' /etc/passwd \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get -y upgrade \
    && apt-get install -y --no-install-recommends \
       bash \
       locales \
       moreutils \
       sudo \
       socat \
-       python3.6 \
+       python3.8 \
       python3-pip \
    && pip3 install --upgrade pip \
    && pip3 install \
--- a/images/calicoctl-utility/Makefile
+++ b/images/calicoctl-utility/Makefile
@ -17,7 +17,7 @@ IMAGE_NAME      ?= calico-utility
 IMAGE_PREFIX    ?= airship/porthole
 IMAGE_TAG       ?= latest
 BUILD_TYPE      ?= community
-OS_RELEASE      ?= ubuntu_bionic
+OS_RELEASE      ?= ubuntu_focal

 IMAGE := $(DOCKER_REGISTRY)/$(IMAGE_PREFIX)/$(IMAGE_NAME):$(IMAGE_TAG)

--- a/images/ceph-utility/Dockerfile.ubuntu_bionic
+++ b/images/ceph-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -10,7 +10,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc

 # Pacific 16.2.10
 ARG CEPH_RELEASE=pacific
-ARG CEPH_RELEASE_TAG=16.2.10-1bionic
+ARG CEPH_RELEASE_TAG=16.2.10-1focal
 ARG KUBE_VERSION=1.24.6

 ARG CEPH_REPO=https://mirror.mirantis.com/acicd/ceph-pacific/
@ -21,11 +21,11 @@ RUN set -xe \
    && export DEBIAN_FRONTEND=noninteractive \
    && sed -i '/nobody/d' /etc/passwd \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update && apt-get dist-upgrade -y \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y wget curl apt-transport-https ca-certificates gnupg\
    && apt-key add /etc/apt/ceph-${CEPH_RELEASE}.key \
    && rm -f /etc/apt/ceph-${CEPH_RELEASE}.key \
-    && echo "deb ${CEPH_REPO} bionic main" | tee /etc/apt/sources.list.d/ceph.list \
+    && echo "deb ${CEPH_REPO} focal main" | tee /etc/apt/sources.list.d/ceph.list \
    && apt-get update \
    && apt-get install -y \
           bash \
@ -44,7 +44,7 @@ RUN set -xe \
           rsync \
           xz-utils \
           iperf \
-           python3.6 \
+           python3.8 \
           python3-pip \
    && pip3 install --upgrade pip \
    && pip3 install \
--- a/images/compute-utility/Dockerfile.ubuntu_bionic
+++ b/images/compute-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -15,7 +15,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
    && sed -i '/nobody/d' /etc/passwd \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y apt-transport-https \
       bash \
       ca-certificates \
@ -33,7 +33,7 @@ RUN set -xe \
       sudo \
       wget \
       xz-utils \
-       python3.6 \
+       python3.8 \
       python3-pip \
    && pip3 install --upgrade pip \
    && pip3 install \
--- a/images/etcdctl-utility/Dockerfile.ubuntu_bionic
+++ b/images/etcdctl-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -19,7 +19,7 @@ RUN set -xe \
    && export DEBIAN_FRONTEND=noninteractive  \
    && sed -i '/nobody/d' /etc/passwd  \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y \
       wget curl \
       locales \
@ -30,7 +30,7 @@ RUN set -xe \
       moreutils \
       sudo \
       rsyslog \
-       python3.6 \
+       python3.8 \
       python3-pip \
       jq \
       rclone \
--- a/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
+++ b/images/mysqlclient-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -17,9 +17,9 @@ RUN set -xe \
    && apt-get update \
    && apt-get install -y wget curl \
        apt-transport-https ca-certificates gnupg \
-   && curl -o /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc 'https://mariadb.org/mariadb_release_signing_key.asc' \
-   && echo 'deb https://mirrors.gigenet.com/mariadb/repo/10.6/ubuntu bionic main' >>/etc/apt/sources.list \
-    && apt-get update  \
+    && curl -o /etc/apt/trusted.gpg.d/mariadb_release_signing_key.asc 'https://mariadb.org/mariadb_release_signing_key.asc' \
+    && echo 'deb https://mirrors.gigenet.com/mariadb/repo/10.6/ubuntu focal main' >> /etc/apt/sources.list \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y \
       bash \
       sudo \
@ -30,7 +30,7 @@ RUN set -xe \
       libdbd-mysql-perl \
       moreutils \
       mysql-client \
-       python3.6 \
+       python3.8 \
       python3-pip \
       jq \
       rclone \
--- a/images/openstack-utility/Dockerfile.ubuntu_bionic
+++ b/images/openstack-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -13,12 +13,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 RUN set -xe \
    && sed -i '/nobody/d' /etc/passwd \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y \
       bash \
       sudo \
       rsyslog \
-       python3.6 \
+       python3.8 \
       python3-pip \
    && pip3 install --upgrade pip \
    && pip3 install \
@ -31,9 +31,10 @@ RUN set -xe \
    && apt-get clean -y \
    && rm -rf /var/lib/apt/lists/*

-RUN sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
-    && sed -i "/handler.setFormatter/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
-    && sed -i "/os.path.basename/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py \
-    && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/local/lib/python3.6/dist-packages/oslo_rootwrap/wrapper.py
+RUN PYTHON_LOCATION=$(pip3 show oslo.rootwrap|grep Location|awk '{print $2}') \
+    && sed -i "/rootwrap_logger.setLevel/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
+    && sed -i "/handler.setFormatter/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
+    && sed -i "/os.path.basename/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py \
+    && sed -i "/rootwrap_logger.addHandler/s/.*/#&/" $PYTHON_LOCATION/oslo_rootwrap/wrapper.py

 CMD ["/bin/bash"]
--- a/images/postgresql-utility/Dockerfile.ubuntu_bionic
+++ b/images/postgresql-utility/Dockerfile.ubuntu_bionic
@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}

 LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \
@ -14,10 +14,10 @@ RUN set -xe  \
    && export DEBIAN_FRONTEND=noninteractive \
    && sed -i '/nobody/d' /etc/passwd  \
    && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \
-    && apt-get update \
+    && apt-get update && apt-get upgrade -y \
    && apt-get install -y wget curl \
        apt-transport-https ca-certificates gnupg \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt bionic-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt focal-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
    && curl -o /etc/apt/trusted.gpg.d/postgresql_release_signing_key.asc 'https://www.postgresql.org/media/keys/ACCC4CF8.asc' \
    && apt-get update \
    && apt-get install -y \
@ -28,7 +28,7 @@ RUN set -xe  \
        sudo \
        postgresql-client \
        postgresql-common \
-        python3.6 \
+        python3.8 \
        python3-pip  \
        jq \
        rclone \
--- a/tools/deployment/000-install-packages.sh
+++ b/tools/deployment/000-install-packages.sh
@ -13,4 +13,6 @@ bash -c "./openstack-helm-infra/tools/deployment/common/000-install-packages.sh"

 sudo apt-get update
 sudo apt-get install --no-install-recommends -y \
-        lvm2
+        lvm2 \
+        ca-certificates \
+        python3-certifi
--- a/tools/gate/playbooks/roles/upgrade-host/tasks/main.yaml
+++ b/tools/gate/playbooks/roles/upgrade-host/tasks/main.yaml
@ -23,7 +23,7 @@
      vars:
        packages:
          deb:
-            - linux-generic-hwe-16.04
+            - linux-generic-hwe-20.04
    - name: Reboot Host following kernel upgrade
      shell: sleep 2 && reboot
      become: yes
--- a/zuul.d/calicoctl-utility.yaml
+++ b/zuul.d/calicoctl-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-calicoctl-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/calicoctl-utility/.*$
      - ^images/calicoctl-utility/.*$
--- a/zuul.d/ceph-utility.yaml
+++ b/zuul.d/ceph-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-ceph-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/ceph-utility/.*$
      - ^images/ceph-utility/.*$
--- a/zuul.d/compute-utility.yaml
+++ b/zuul.d/compute-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-compute-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/compute-utility/.*$
      - ^images/compute-utility/.*$
--- a/zuul.d/etcdctl-utility.yaml
+++ b/zuul.d/etcdctl-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-etcdctl-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^images/etcdctl-utility/.*$
      - ^charts/etcdctl-utility/.*$
--- a/zuul.d/mysqlclient-utility.yaml
+++ b/zuul.d/mysqlclient-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-mysqlclient-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/mysqlclient-utility/.*$
      - ^images/mysqlclient-utility/.*$
--- a/zuul.d/openstack-utility.yaml
+++ b/zuul.d/openstack-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-openstack-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/openstack-utility/.*$
      - ^images/openstack-utility/.*$
--- a/zuul.d/postgresql-utility.yaml
+++ b/zuul.d/postgresql-utility.yaml
@ -17,7 +17,7 @@
    parent: &parent airship-porthole-images
    vars:
      image_name: &image_name porthole-postgresql-utility
-      distro_suffix: &distro_suffix ubuntu_bionic
+      distro_suffix: &distro_suffix ubuntu_focal
    files:
      - ^charts/postgresql-utility/.*$
      - ^images/postgresql-utility/.*$