Add Kubelet config, remove deprecated flags and fix minor bugs (#4724)

* Add kubelet config

* Change kubelet_authorization_mode_webhook to true

* Fix lint

* Sync env file

* Refactor the kubernetes node folder

* Remove deprecated flag and fix lint

roles/kubernetes/node/tasks/install.yml

@@ -73,10 +73,3 @@
   args:
     creates: "{{ bin_dir }}/socat"
   when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
-
-- name: install | Write kubelet systemd init file
-  template:
-    src: "kubelet.host.service.j2"
-    dest: "/etc/systemd/system/kubelet.service"
-    backup: "yes"
-  notify: restart kubelet

roles/kubernetes/node/tasks/kubelet.yml

@@ -0,0 +1,71 @@
+---
+- name: Make sure dynamic kubelet configuration directory is writeable
+  file:
+    path: "{{ dynamic_kubelet_configuration_dir }}"
+    mode: 0600
+    state: directory
+  when: dynamic_kubelet_configuration
+
+- name: gets the kubeadm version
+  command: "{{ bin_dir }}/kubeadm version -o short"
+  register: kubeadm_output
+
+- name: sets kubeadm api version to v1beta1
+  set_fact:
+    kubeadmConfig_api_version: v1beta1
+  when: kubeadm_output.stdout is version('v1.13.0', '>=')
+  tags:
+    - kubelet
+    - kubeadm
+
+- name: Write kubelet environment config file (kubeadm)
+  template:
+    src: "kubelet.env.{{ kubeadmConfig_api_version }}.j2"
+    dest: "{{ kube_config_dir }}/kubelet.env"
+    backup: yes
+  notify: restart kubelet
+  when: kubeadm_output.stdout is version('v1.13.0', '>=')
+  tags:
+    - kubelet
+    - kubeadm
+
+- name: Write kubelet environment config file (kubeadm)
+  template:
+    src: "kubelet.env.j2"
+    dest: "{{ kube_config_dir }}/kubelet.env"
+    backup: yes
+  notify: restart kubelet
+  when: kubeadm_output.stdout is version('v1.13.0', '<')
+  tags:
+    - kubelet
+    - kubeadm
+
+- name: Write kubelet config file
+  template:
+    src: "kubelet-config.{{ kubeadmConfig_api_version }}.yaml.j2"
+    dest: "{{ kube_config_dir }}/kubelet-config.yaml"
+  when: kubeadm_output.stdout is version('v1.13.0', '>=')
+  tags:
+    - kubelet
+    - kubeadm
+
+- name: Write kubelet systemd init file
+  template:
+    src: "kubelet.service.j2"
+    dest: "/etc/systemd/system/kubelet.service"
+    backup: "yes"
+  notify: restart kubelet
+  tags:
+    - kubelet
+    - kubeadm
+
+- name: flush_handlers and reload-systemd
+  meta: flush_handlers
+
+- name: Enable kubelet
+  service:
+    name: kubelet
+    enabled: yes
+    state: started
+  tags:
+    - kubelet

roles/kubernetes/node/tasks/loadbalancer/haproxy.yml

@@ -18,7 +18,7 @@
 
 - name: haproxy | Write haproxy configuration
   template:
-    src: haproxy.cfg.j2
+    src: "loadbalancer/haproxy.cfg.j2"
     dest: "{{ haproxy_config_dir }}/haproxy.cfg"
     owner: root
     mode: 0755

roles/kubernetes/node/tasks/loadbalancer/nginx-proxy.yml

@@ -18,7 +18,7 @@
 
 - name: nginx-proxy | Write nginx-proxy configuration
   template:
-    src: nginx.conf.j2
+    src: "loadbalancer/nginx.conf.j2"
     dest: "{{ nginx_config_dir }}/nginx.conf"
     owner: root
     mode: 0755

roles/kubernetes/node/tasks/main.yml

@@ -17,7 +17,7 @@
   tags:
     - kubelet
 
-- import_tasks: nginx-proxy.yml
+- import_tasks: loadbalancer/nginx-proxy.yml
   when:
     - not is_kube_master
     - loadbalancer_apiserver_localhost
@@ -25,7 +25,7 @@
   tags:
     - nginx
 
-- import_tasks: haproxy.yml
+- import_tasks: loadbalancer/haproxy.yml
   when:
     - not is_kube_master
     - loadbalancer_apiserver_localhost
@@ -33,23 +33,6 @@
   tags:
     - haproxy
 
-- name: Make sure dynamic kubelet configuration directory is writeable
-  file:
-    path: "{{ dynamic_kubelet_configuration_dir }}"
-    mode: 0600
-    state: directory
-  when: dynamic_kubelet_configuration
-
-- name: Write kubelet config file (kubeadm)
-  template:
-    src: kubelet.kubeadm.env.j2
-    dest: "{{ kube_config_dir }}/kubelet.env"
-    backup: yes
-  notify: restart kubelet
-  tags:
-    - kubelet
-    - kubeadm
-
 - name: Ensure nodePort range is reserved
   sysctl:
     name: net.ipv4.ip_local_reserved_ports
@@ -99,7 +82,7 @@
     name: "{{ item }}"
     state: present
     sysctl_file: "{{ sysctl_file_path }}"
-    value: 1
+    value: "1"
     reload: yes
   when: sysctl_bridge_nf_call_iptables.rc == 0
   with_items:
@@ -175,7 +158,7 @@
   tags:
     - kube-proxy
 
-- include_tasks: "{{ cloud_provider }}-credential-check.yml"
+- include_tasks: "cloud-credentials/{{ cloud_provider }}-credential-check.yml"
   when:
     - cloud_provider is defined
     - cloud_provider in [ 'openstack', 'azure', 'vsphere' ]
@@ -200,7 +183,7 @@
 
 - name: Write cloud-config
   template:
-    src: "{{ cloud_provider }}-cloud-config.j2"
+    src: "cloud-configs/{{ cloud_provider }}-cloud-config.j2"
     dest: "{{ kube_config_dir }}/cloud_config"
     group: "{{ kube_cert_group }}"
     mode: 0640
@@ -211,13 +194,7 @@
   tags:
     - cloud-provider
 
-# reload-systemd
-- meta: flush_handlers
-
-- name: Enable kubelet
-  service:
-    name: kubelet
-    enabled: yes
-    state: started
+- import_tasks: kubelet.yml
   tags:
     - kubelet
+    - kubeadm