From 9e2d684188000cef2db436c84d13b9d9c3edf1d2 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Mon, 30 Jul 2018 18:30:59 -0500
Subject: [PATCH] K8s: update to 1.10.6 in OSH gates
This PS bumps the version of k8s used in the gates to 1.10.6
Change-Id: I396fe0c0e276d17eb52bfe289a464b7008b8d4d2
Signed-off-by: Pete Birley <pete@port.direct>
---
roles/build-images/defaults/main.yml | 2 +-
tools/images/kubeadm-aio/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/roles/build-images/defaults/main.yml b/roles/build-images/defaults/main.yml
index 72c1455b8..236762ebe 100644
--- a/roles/build-images/defaults/main.yml
+++ b/roles/build-images/defaults/main.yml
@@ -13,7 +13,7 @@
# limitations under the License.
version:
- kubernetes: v1.10.5
+ kubernetes: v1.10.6
helm: v2.9.1
cni: v0.6.0
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index ffc77d7d9..e258eedcb 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -28,7 +28,7 @@ RUN sed -i \
/etc/apt/sources.list ;\
echo "APT::Get::AllowUnauthenticated \"${ALLOW_UNAUTHENTICATED}\";" > /etc/apt/apt.conf.d/allow-unathenticated
-ARG KUBE_VERSION="v1.10.5"
+ARG KUBE_VERSION="v1.10.6"
ENV KUBE_VERSION ${KUBE_VERSION}
ARG CNI_VERSION="v0.6.0"