airship/porthole
Code Issues Proposed changes

Update all the utility containers to K8s 1.17.3

Browse Source 
Utility Containers are updated to K8s 1.17.3
to align with current target version of K8s.

Change-Id: I6e7bef0aac4012468151c9c9d74467bf458d9c23
This commit is contained in:
KAVVA, JAGAN MOHAN REDDY (jk330k) 2020-07-07 09:09:04 -05:00 committed by Jagan Mohan Kavva
parent 0f8835305b
commit a8b0517a4f
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
images/ceph-utility/Dockerfile.ubuntu_bionic
View File

@ -11,7 +11,7 @@ LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc
# Nautilus 14.2.9
ARG CEPH_RELEASE=nautilus
ARG CEPH_RELEASE_TAG=14.2.9-1.0~bionic
ARG KUBE_VERSION=1.16.2
ARG KUBE_VERSION=1.17.3
ARG CEPH_REPO=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/
ARG CEPH_KEY=https://mirror.mirantis.com/testing/ceph-nautilus/bionic/archive-ceph-nautilus.key
@ -53,9 +53,10 @@ RUN set -xe \
&& apt-get clean \
&& TMP_DIR=$(mktemp --directory) \
&& cd ${TMP_DIR} \
&& curl -sSL https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz | tar -zxv --strip-components=1 \
&& mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \
&& chmod +x /usr/bin/kubectl \
&& curl -sSLO https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
&& tar -xvf ${TMP_DIR}/kubernetes-client-linux-amd64.tar.gz --strip-components=1 \
-C /usr/bin kubernetes/client/bin/kubectl \
&& mv /usr/bin/client/bin/kubectl /usr/bin/kubectl \
&& rm -rf \
${TMP_DIR} \
/var/lib/apt/lists/*

8
images/compute-utility/Dockerfile.ubuntu_bionic
View File

@ -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.12.2
ARG KUBE_VERSION=1.17.3
ARG DEBIAN_FRONTEND=noninteractive
@ -42,9 +42,9 @@ RUN set -xe \
&& TMP_DIR=$(mktemp --directory) \
&& cd ${TMP_DIR} \
&& curl -sSLO https://dl.k8s.io/v${KUBE_VERSION}/kubernetes-client-linux-amd64.tar.gz \
&& tar --strip-components=1 -zxvf kubernetes-client-linux-amd64.tar.gz \
&& mv ${TMP_DIR}/client/bin/kubectl /usr/bin/kubectl \
&& chmod +x /usr/bin/kubectl \
&& tar -xvf ${TMP_DIR}/kubernetes-client-linux-amd64.tar.gz --strip-components=1 \
-C /usr/bin kubernetes/client/bin/kubectl \
&& mv /usr/bin/client/bin/kubectl /usr/bin/kubectl \
&& rm -rf \
${TMP_DIR} \
/var/lib/apt/lists/*