From 0d969910afb20922796e361450944bc3d18c4bf7 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Wed, 28 Mar 2018 00:31:15 -0400
Subject: [PATCH] Kube: Kubernetes v1.10.2 support

This Ps adds support for kubernetes v1.10.2

Change-Id: Ic1db020cc86fa9db78f3f3cfcda92e3291a889a8
---
 playbooks/vars.yaml                                    |  2 +-
 tools/images/kubeadm-aio/Dockerfile                    |  2 +-
 tools/images/kubeadm-aio/assets/entrypoint.sh          |  2 +-
 .../roles/deploy-kubeadm-master/tasks/main.yaml        | 10 ++++++++++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 928601c3f..9f82d9ec3 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 version:
-  kubernetes: v1.9.6
+  kubernetes: v1.10.2
   helm: v2.8.2
   cni: v0.6.0
 
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index b65d04679..093502a47 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -16,7 +16,7 @@
 FROM gcr.io/google-containers/debian-base-amd64:0.3
 MAINTAINER pete.birley@att.com
 
-ARG KUBE_VERSION="v1.9.3"
+ARG KUBE_VERSION="v1.10.2"
 ENV KUBE_VERSION ${KUBE_VERSION}
 
 ARG CNI_VERSION="v0.6.0"
diff --git a/tools/images/kubeadm-aio/assets/entrypoint.sh b/tools/images/kubeadm-aio/assets/entrypoint.sh
index 3a60abdc0..095d37251 100755
--- a/tools/images/kubeadm-aio/assets/entrypoint.sh
+++ b/tools/images/kubeadm-aio/assets/entrypoint.sh
@@ -17,7 +17,7 @@
 set -e
 if [ "x${ACTION}" == "xgenerate-join-cmd" ]; then
 : ${TTL:="10m"}
-DISCOVERY_TOKEN="$(kubeadm token --kubeconfig /etc/kubernetes/admin.conf create --ttl ${TTL} --usages signing --groups '')"
+DISCOVERY_TOKEN="$(kubeadm token --kubeconfig /etc/kubernetes/admin.conf create --ttl ${TTL} --usages signing,authentication --groups '')"
 TLS_BOOTSTRAP_TOKEN="$(kubeadm token --kubeconfig /etc/kubernetes/admin.conf create --ttl ${TTL} --usages authentication --groups \"system:bootstrappers:kubeadm:default-node-token\")"
 DISCOVERY_TOKEN_CA_HASH="$(openssl x509 -pubkey -in /etc/kubernetes/pki/ca.crt | openssl rsa -pubin -outform der 2>/dev/null | openssl dgst -sha256 -hex | sed 's/^.* /sha256:/')"
 API_SERVER=$(cat /etc/kubernetes/admin.conf | python -c "import sys, yaml; print yaml.safe_load(sys.stdin)['clusters'][0]['cluster']['server'].split(\"//\",1).pop()")
diff --git a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/main.yaml b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/main.yaml
index 16529a307..f5df5b575 100644
--- a/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/main.yaml
+++ b/tools/images/kubeadm-aio/assets/opt/playbooks/roles/deploy-kubeadm-master/tasks/main.yaml
@@ -41,10 +41,20 @@
 - name: generating certs
   delegate_to: 127.0.0.1
   block:
+    - name: master | deploy | certs | etcd-ca
+      command: kubeadm alpha phase certs etcd-ca --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
+    - name: master | deploy | certs | etcd-server
+      command: kubeadm alpha phase certs etcd-server --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
+    - name: master | deploy | certs | etcd-peer
+      command: kubeadm alpha phase certs etcd-peer --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
+    - name: master | deploy | certs | etcd-healthcheck-client
+      command: kubeadm alpha phase certs etcd-healthcheck-client --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
     - name: master | deploy | certs | ca
       command: kubeadm alpha phase certs ca --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
     - name: master | deploy | certs | apiserver
       command: kubeadm alpha phase certs apiserver --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
+    - name: master | deploy | certs | apiserver-etcd-client
+      command: kubeadm alpha phase certs apiserver-etcd-client --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
     - name: master | deploy | certs | apiserver-kubelet-client
       command: kubeadm alpha phase certs apiserver-kubelet-client --config /mnt/rootfs/etc/kubernetes/kubeadm-conf.yaml
     - name: master | deploy | certs | sa