airship/porthole
Code Issues Proposed changes

Calicoctl-utility python and Ubuntu upgrade.

Browse Source 
This Patchset updated Ubuntu to  Bionic
and Python from 2.0 to 3.0

Change-Id: Idd910fc74558ceb43ace48652e2c6bd6232aeb9e
This commit is contained in:
Rahul Khiyani 2019-12-01 21:59:19 -06:00 committed by diwakar thyagaraj
parent 28bddef227
commit 72394708c9
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/calicoctl-utility/values.yaml
View File

@ -19,7 +19,7 @@
images: images:
tags: tags:
calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_xenial' calicoctl_utility: 'quay.io/airshipit/porthole-calicoctl-utility:latest-ubuntu_bionic'
image_repo_sync: docker.io/docker:18.09.02 image_repo_sync: docker.io/docker:18.09.02
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

4
images/calicoctl-utility/Dockerfile.ubuntu_xenial → images/calicoctl-utility/Dockerfile.ubuntu_bionic
View File

@ -1,4 +1,4 @@
ARG FROM=docker.io/ubuntu:xenial ARG FROM=docker.io/ubuntu:bionic
ARG DOCKER_REGISTRY=quay.io ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=calico/ctl ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
ARG CALICOCTL_VERSION=v3.4.4 ARG CALICOCTL_VERSION=v3.4.4
@ -27,6 +27,8 @@ RUN set -xe \
locales \ locales \
moreutils \ moreutils \
sudo \ sudo \
python3 \
python3-pip \
python3-oslo.rootwrap \ python3-oslo.rootwrap \
socat \ socat \
&& apt-get clean -y \ && apt-get clean -y \

4
images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_xenial → images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
View File

@ -1,4 +1,4 @@
ARG FROM=docker.io/ubuntu:xenial ARG FROM=docker.io/ubuntu:bionic
ARG DOCKER_REGISTRY=quay.io ARG DOCKER_REGISTRY=quay.io
ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
ARG CALICOCTL_VERSION=v2.5.1 ARG CALICOCTL_VERSION=v2.5.1
@ -33,6 +33,8 @@ RUN set -xe \
locales \ locales \
moreutils \ moreutils \
sudo \ sudo \
python3 \
python3-pip \
python3-oslo.rootwrap \ python3-oslo.rootwrap \
socat \ socat \
&& apt-get clean -y \ && apt-get clean -y \

2
zuul.d/calicoctl-utility.yaml
View File

@ -17,7 +17,7 @@
parent: &parent airship-porthole-images parent: &parent airship-porthole-images
vars: vars:
image_name: &image_name porthole-calicoctl-utility image_name: &image_name porthole-calicoctl-utility
distro_suffix: &distro_suffix ubuntu_xenial distro_suffix: &distro_suffix ubuntu_bionic
files: files:
- ^charts/calicoctl-utility/.*$ - ^charts/calicoctl-utility/.*$
- ^images/calicoctl-utility/.*$ - ^images/calicoctl-utility/.*$