Add support for k8s v1.17.0-rc.1, remove hyperkube (#5378)

Change-Id: I3fff04f0211cd9c2e8235acaf51c3aa98abc8bb7

roles/kubernetes/master/tasks/main.yml

@@ -19,7 +19,7 @@
 
 - name: Install | Copy kubectl binary from download dir
   synchronize:
-    src: "{{ local_release_dir }}/hyperkube-{{ kube_version }}-{{ image_arch }}"
+    src: "{{ local_release_dir }}/kubectl-{{ kube_version }}-{{ image_arch }}"
     dest: "{{ bin_dir }}/kubectl"
     compress: no
     perms: yes
@@ -28,7 +28,6 @@
   changed_when: false
   delegate_to: "{{ inventory_hostname }}"
   tags:
-    - hyperkube
     - kubectl
     - upgrade
 
@@ -38,7 +37,6 @@
     mode: "0755"
     state: file
   tags:
-    - hyperkube
     - kubectl
     - upgrade
 

roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2

@@ -91,7 +91,6 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
 {% endif %}
 certificatesDir: {{ kube_cert_dir }}
 imageRepository: {{ kube_image_repo }}
-useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
 apiServer:
   extraArgs:
 {% if kube_api_anonymous_auth is defined %}

roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2

@@ -94,7 +94,6 @@ controlPlaneEndpoint: {{ ip | default(fallback_ips[inventory_hostname]) }}:{{ ku
 {% endif %}
 certificatesDir: {{ kube_cert_dir }}
 imageRepository: {{ kube_image_repo }}
-useHyperKubeImage: {{ kubeadm_use_hyperkube_image }}
 apiServer:
   extraArgs:
 {% if kube_api_anonymous_auth is defined %}

roles/kubernetes/node/tasks/install.yml

@@ -25,7 +25,7 @@
 
 - name: install | Copy kubelet binary from download dir
   synchronize:
-    src: "{{ local_release_dir }}/hyperkube-{{ kube_version }}-{{ image_arch }}"
+    src: "{{ local_release_dir }}/kubelet-{{ kube_version }}-{{ image_arch }}"
     dest: "{{ bin_dir }}/kubelet"
     compress: no
     perms: yes
@@ -33,7 +33,7 @@
     group: no
   delegate_to: "{{ inventory_hostname }}"
   tags:
-    - hyperkube
+    - kubelet
     - upgrade
   notify: restart kubelet
 
@@ -43,29 +43,7 @@
     mode: "0755"
     state: file
   tags:
-    - hyperkube
-    - upgrade
-
-- name: install | Copy hyperkube binary from download dir
-  synchronize:
-    src: "{{ local_release_dir }}/hyperkube-{{ kube_version }}-{{ image_arch }}"
-    dest: "{{ bin_dir }}/hyperkube"
-    compress: no
-    perms: yes
-    owner: no
-    group: no
-  delegate_to: "{{ inventory_hostname }}"
-  tags:
-    - hyperkube
-    - upgrade
-
-- name: install | Set hyperkube binary permissions
-  file:
-    path: "{{ bin_dir }}/hyperkube"
-    mode: "0755"
-    state: file
-  tags:
-    - hyperkube
+    - kubelet
     - upgrade
 
 - name: install | Copy socat wrapper for Container Linux

roles/kubernetes/node/tasks/main.yml

@@ -149,12 +149,33 @@
   tags:
     - kube-proxy
 
-- name: Cleanup kube-proxy leftovers from node
-  command: "{{ bin_dir }}/hyperkube kube-proxy --cleanup"
+- name: Set command for kube-proxy cleanup
+  set_fact:
+    kube_proxy_cleanup_command: >-
+      {%- if container_manager in ['docker', 'crio'] %}
+      {{ docker_bin_dir }}/docker run --rm --privileged -v /lib/modules:{{ kube_proxy_image_repo }}:{{ kube_version }} --cleanup
+      {%- elif container_manager == "containerd" %}
+      ctr run --rm --mount type=bind,src=/lib/modules,dst=/lib/modules,options=rbind:rw {{ kube_proxy_image_repo }}:{{ kube_version }} kube-proxy --cleanup
+      {%- endif %}
   when:
     - kube_proxy_remove
+  tags:
+    - kube-proxy
+
+- name: Ensure kube-proxy container is pulled for containerd
+  command: "{{ bin_dir }}/crictl pull {{ kube_proxy_image_repo }}:{{ kube_version }}"
+  when:
+    - kube_proxy_remove
+    - container_manager == "containerd"
+  tags:
+    - kube-proxy
+
+- name: Cleanup kube-proxy leftovers from node
+  command: "{{ kube_proxy_cleanup_command }}"
   # `kube-proxy --cleanup`, being Ok as per shown WARNING, still returns 255 from above run (?)
   ignore_errors: true
+  when:
+    - kube_proxy_remove
   tags:
     - kube-proxy