diff --git a/charts/compute-utility/templates/bin/_start.sh.tpl b/charts/compute-utility/templates/bin/_start.sh.tpl index 8ea307ef..88fb20a9 100644 --- a/charts/compute-utility/templates/bin/_start.sh.tpl +++ b/charts/compute-utility/templates/bin/_start.sh.tpl @@ -23,10 +23,10 @@ root logger by oslo-rootwrap module, imported in _openstack-utility-rootwrap.tpl These lines will get rid of duplicate logs, generated because of the formatter attached by oslo-rootwrap. */}} -sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py -sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py -sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py -sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python2.7/dist-packages/oslo_rootwrap/wrapper.py +sed -i "/rootwrap_logger.setLevel/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py +sed -i "/handler.setFormatter/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py +sed -i "/os.path.basename/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py +sed -i "/rootwrap_logger.addHandler/s/.*/#&/" /usr/lib/python3/dist-packages/oslo_rootwrap/wrapper.py # for readiness probe touch /tmp/done diff --git a/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl b/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl index e0681479..84dea6a2 100644 --- a/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl +++ b/charts/compute-utility/templates/bin/utility/_compute-utility-rootwrap.tpl @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 {{/* Copyright 2019 The Openstack-Helm Authors. diff --git a/charts/compute-utility/values.yaml b/charts/compute-utility/values.yaml index 03c473d2..08b8dc5e 100644 --- a/charts/compute-utility/values.yaml +++ b/charts/compute-utility/values.yaml @@ -27,7 +27,7 @@ release_uuid: null images: pull_policy: IfNotPresent tags: - compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_xenial' + compute_utility: 'quay.io/airshipit/porthole-compute-utility:latest-ubuntu_bionic' image_repo_sync: docker.io/docker:18.09.02 local_registry: active: false diff --git a/images/compute-utility/Dockerfile.ubuntu_xenial b/images/compute-utility/Dockerfile.ubuntu_bionic similarity index 91% rename from images/compute-utility/Dockerfile.ubuntu_xenial rename to images/compute-utility/Dockerfile.ubuntu_bionic index 0ecc305d..15cfe519 100755 --- a/images/compute-utility/Dockerfile.ubuntu_xenial +++ b/images/compute-utility/Dockerfile.ubuntu_bionic @@ -1,4 +1,4 @@ -ARG FROM=docker.io/ubuntu:xenial +ARG FROM=docker.io/ubuntu:bionic FROM ${FROM} LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' \ @@ -10,6 +10,8 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc ARG KUBE_VERSION=1.12.2 +ARG DEBIAN_FRONTEND=noninteractive + RUN set -xe \ && sed -i '/nobody/d' /etc/passwd \ && echo "nobody:x:65534:65534:nobody:/nonexistent:/bin/bash" >> /etc/passwd \ @@ -23,7 +25,9 @@ RUN set -xe \ iperf \ jq \ moreutils \ - python-oslo.rootwrap \ + python3 \ + python3-pip \ + python3-oslo.rootwrap \ radosgw \ rsyslog \ s3cmd \ diff --git a/zuul.d/compute-utility.yaml b/zuul.d/compute-utility.yaml index ed3568fd..f7b29b2d 100644 --- 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_xenial + distro_suffix: &distro_suffix ubuntu_bionic files: - ^charts/compute-utility/.*$ - ^images/compute-utility/.*$