From abe9b40602ce416fa229c0b3540b1b12f4d6d922 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Thu, 19 Mar 2020 09:33:23 -0400 Subject: [PATCH] Ensure we always fixup kube-proxy kubeconfig (#5524) (#5559) When running with serial != 100%, like upgrade_cluster.yml, we need to apply this fixup each time Problem was introduced in 05dc2b3a097fda2ffff7a77f4ca843d0e41dec76 Signed-off-by: Etienne Champetier (cherry picked from commit 5e9479cdedc21c7a1c6b2fb3b85ad863212ff521) --- roles/kubernetes/kubeadm/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/kubeadm/tasks/main.yml b/roles/kubernetes/kubeadm/tasks/main.yml index af5a0855d..4b9d32da6 100644 --- a/roles/kubernetes/kubeadm/tasks/main.yml +++ b/roles/kubernetes/kubeadm/tasks/main.yml @@ -110,8 +110,8 @@ | sed 's#server:.*#server:\ {{ kube_apiserver_endpoint }}#g' | {{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf replace -f - run_once: true + delegate_to: "{{ groups['kube-master']|first }}" when: - - inventory_hostname == groups['kube-master']|first - kubeadm_config_api_fqdn is not defined - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "") - not kube_proxy_remove @@ -121,8 +121,8 @@ - name: Restart all kube-proxy pods to ensure that they load the new configmap shell: "{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf delete pod -n kube-system -l k8s-app=kube-proxy --force --grace-period=0" run_once: true + delegate_to: "{{ groups['kube-master']|first }}" when: - - inventory_hostname == groups['kube-master']|first - kubeadm_config_api_fqdn is not defined - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "") - not kube_proxy_remove @@ -145,8 +145,8 @@ - name: Delete kube-proxy daemonset if kube_proxy_remove set, e.g. kube_network_plugin providing proxy services shell: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf delete daemonset -n kube-system kube-proxy" run_once: true + delegate_to: "{{ groups['kube-master']|first }}" when: - - inventory_hostname == groups['kube-master']|first - kube_proxy_remove - kubeadm_discovery_address != kube_apiserver_endpoint | replace("https://", "") tags: