From 72394708c92b8ddf680b3aa8067feee5b5009a2a Mon Sep 17 00:00:00 2001
From: Rahul Khiyani <rahul.khiyani@att.com>
Date: Sun, 1 Dec 2019 21:59:19 -0600
Subject: [PATCH] Calicoctl-utility python and Ubuntu upgrade.

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

Change-Id: Idd910fc74558ceb43ace48652e2c6bd6232aeb9e
---
 charts/calicoctl-utility/values.yaml                          | 2 +-
 .../{Dockerfile.ubuntu_xenial => Dockerfile.ubuntu_bionic}    | 4 +++-
 ...untu_xenial => Dockerfile_calicoq_calicoctl.ubuntu_bionic} | 4 +++-
 zuul.d/calicoctl-utility.yaml                                 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 rename images/calicoctl-utility/{Dockerfile.ubuntu_xenial => Dockerfile.ubuntu_bionic} (95%)
 rename images/calicoctl-utility/{Dockerfile_calicoq_calicoctl.ubuntu_xenial => Dockerfile_calicoq_calicoctl.ubuntu_bionic} (96%)

diff --git a/charts/calicoctl-utility/values.yaml b/charts/calicoctl-utility/values.yaml
index 6ed66d1c..d5f4a68b 100644
--- a/charts/calicoctl-utility/values.yaml
+++ b/charts/calicoctl-utility/values.yaml
@@ -19,7 +19,7 @@
 
 images:
   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
   pull_policy: IfNotPresent
   local_registry:
diff --git a/images/calicoctl-utility/Dockerfile.ubuntu_xenial b/images/calicoctl-utility/Dockerfile.ubuntu_bionic
similarity index 95%
rename from images/calicoctl-utility/Dockerfile.ubuntu_xenial
rename to images/calicoctl-utility/Dockerfile.ubuntu_bionic
index 14755abe..fe2f4e32 100644
--- a/images/calicoctl-utility/Dockerfile.ubuntu_xenial
+++ b/images/calicoctl-utility/Dockerfile.ubuntu_bionic
@@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:xenial
+ARG FROM=docker.io/ubuntu:bionic
 ARG DOCKER_REGISTRY=quay.io
 ARG CALICOCTL_IMAGE_PREFIX=calico/ctl
 ARG CALICOCTL_VERSION=v3.4.4
@@ -27,6 +27,8 @@ RUN set -xe \
          locales \
          moreutils \
          sudo \
+         python3 \
+         python3-pip \
          python3-oslo.rootwrap \
          socat \
     && apt-get clean -y \
diff --git a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_xenial b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
similarity index 96%
rename from images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_xenial
rename to images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
index f2f9f375..624c5f5a 100644
--- a/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_xenial
+++ b/images/calicoctl-utility/Dockerfile_calicoq_calicoctl.ubuntu_bionic
@@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:xenial
+ARG FROM=docker.io/ubuntu:bionic
 ARG DOCKER_REGISTRY=quay.io
 ARG CALICOCTL_IMAGE_PREFIX=tigera/calicoctl
 ARG CALICOCTL_VERSION=v2.5.1
@@ -33,6 +33,8 @@ RUN set -xe \
          locales \
          moreutils \
          sudo \
+         python3 \
+         python3-pip \
          python3-oslo.rootwrap \
          socat \
     && apt-get clean -y \
diff --git a/zuul.d/calicoctl-utility.yaml b/zuul.d/calicoctl-utility.yaml
index db91d9d6..e0844386 100644
--- 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_xenial
+      distro_suffix: &distro_suffix ubuntu_bionic
     files:
       - ^charts/calicoctl-utility/.*$
       - ^images/calicoctl-utility/.*$