Skip to content

Commit

Permalink
[CE-172] add kubernetes 1.8.x support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tongliofcary committed Nov 15, 2017
1 parent 71fe841 commit f7a11fb
Showing 1 changed file with 18 additions and 1 deletion.
19 changes: 18 additions & 1 deletion src/agent/ansible/roles/env_k8s/worker/tasks/apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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"
Expand Down

0 comments on commit f7a11fb

Please sign in to comment.