From a42d8114207bc1c2483175e6ae993722be3d2497 Mon Sep 17 00:00:00 2001
From: Samuel Liu <liupeng0518@gmail.com>
Date: Thu, 20 Aug 2020 19:33:23 +0800
Subject: [PATCH] fix scale playbook (#6482)

---
 roles/kubernetes/kubeadm/handlers/main.yml |  4 ++--
 scale.yml                                  | 23 +++++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/roles/kubernetes/kubeadm/handlers/main.yml b/roles/kubernetes/kubeadm/handlers/main.yml
index 4c2b1257c..b7b96f647 100644
--- a/roles/kubernetes/kubeadm/handlers/main.yml
+++ b/roles/kubernetes/kubeadm/handlers/main.yml
@@ -3,13 +3,13 @@
   command: /bin/true
   notify:
     - Kubeadm | reload systemd
-    - Kubeadm | reload kubelet
+    - Kubeadm | restart kubelet
 
 - name: Kubeadm | reload systemd
   systemd:
     daemon_reload: true
 
-- name: Kubeadm | reload kubelet
+- name: Kubeadm | restart kubelet
   service:
     name: kubelet
     state: restarted
diff --git a/scale.yml b/scale.yml
index b4f3dd058..510f0aa44 100644
--- a/scale.yml
+++ b/scale.yml
@@ -30,7 +30,7 @@
   gather_facts: false
   roles:
     - { role: kubespray-defaults }
-    - { role: bootstrap-os, tags: bootstrap-os}
+    - { role: bootstrap-os, tags: bootstrap-os }
 
 - name: Gather facts
   tags: always
@@ -46,13 +46,14 @@
 
 - name: Download images to ansible host cache via first kube-master node
   hosts: kube-master[0]
+  gather_facts: False
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
   roles:
-    - { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost"}
+    - { role: kubespray-defaults, when: "not skip_downloads and download_run_once and not download_localhost" }
     - { role: kubernetes/preinstall, tags: preinstall, when: "not skip_downloads and download_run_once and not download_localhost" }
     - { role: download, tags: download, when: "not skip_downloads and download_run_once and not download_localhost" }
 
-- name: Target only workers to get kubelet installed and checking in on any new nodes
+- name: Target only workers to get kubelet installed and checking in on any new nodes(engine)
   hosts: kube-node
   gather_facts: False
   any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
@@ -62,7 +63,23 @@
     - { role: container-engine, tags: "container-engine", when: deploy_container_engine|default(true) }
     - { role: download, tags: download, when: "not skip_downloads" }
     - { role: etcd, tags: etcd, etcd_cluster_setup: false, when: "not etcd_kubeadm_enabled|default(false)" }
+  environment: "{{ proxy_env }}"
+
+- name: Target only workers to get kubelet installed and checking in on any new nodes(node)
+  hosts: kube-node
+  gather_facts: False
+  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
+  roles:
+    - { role: kubespray-defaults }
     - { role: kubernetes/node, tags: node }
+  environment: "{{ proxy_env }}"
+
+- name: Target only workers to get kubelet installed and checking in on any new nodes(network)
+  hosts: kube-node
+  gather_facts: False
+  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
+  roles:
+    - { role: kubespray-defaults }
     - { role: kubernetes/kubeadm, tags: kubeadm }
     - { role: network_plugin, tags: network }
     - { role: kubernetes/node-label, tags: node-label }