From f7a11fb1b29220e039a42971ba23d7afd304d6b5 Mon Sep 17 00:00:00 2001
From: tongliofcary <litong01@us.ibm.com>
Date: Wed, 15 Nov 2017 12:07:26 -0500
Subject: [PATCH] [CE-172] add kubernetes 1.8.x support

Currently the ansible agent only supports k8s 1.7.x releases
this patch set will add the support for releases 1.8.3 which
is the latest k8s release up to date.

Change-Id: Ib42878f804e8c3769ce299407ba6d20d430dfe9a
Signed-off-by: tongliofcary <litong01@us.ibm.com>
---
 .../roles/env_k8s/worker/tasks/apply.yml      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/agent/ansible/roles/env_k8s/worker/tasks/apply.yml b/src/agent/ansible/roles/env_k8s/worker/tasks/apply.yml
index 88042e07..91c76db7 100755
--- a/src/agent/ansible/roles/env_k8s/worker/tasks/apply.yml
+++ b/src/agent/ansible/roles/env_k8s/worker/tasks/apply.yml
@@ -49,10 +49,22 @@
     dest: "~/.kube/config"
     mode: 0600
 
+- name: Setup kubeconfig for each node
+  template:
+    src: "{{ playbook_dir }}/../env_k8s/worker/templates/kubeconfig.j2"
+    dest: "/etc/kubernetes/kubeconfig"
+    mode: 0600
+
+- name: Check kubelet version
+  command: "{{ fabricroot }}/bin/kubelet --version"
+  register: kubeversion
+
 - name: Setup worker node service variables
   set_fact:
     kubelet_params: >-
-      --api-servers={{ private_ip }}:8080
+      --cloud-provider=''
+      --kubeconfig=/etc/kubernetes/kubeconfig
+      --require-kubeconfig
       --container-runtime=docker
       --cluster-dns={{ cluster.dns_service_ip }}
       --cluster-domain={{ cluster.domain }}
@@ -62,6 +74,11 @@
       --master={{ private_ip }}:8080
       --cluster-cidr={{ cluster.container_network.Network }}
 
+- name: Setup worker node service variables
+  set_fact:
+    kubelet_params: "{{ kubelet_params }} --fail-swap-on=false"
+  when: kubeversion.stdout | search('v1.8.')
+
 - name: Configure the worker node services
   template:
     src: "{{ playbook_dir }}/../env_k8s/worker/templates/k8s.conf.j2"