From 815eebf1d7baa8f7f20cb90e11c64a229666f5fb Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Wed, 11 Dec 2019 20:23:55 +0100
Subject: [PATCH] Add wait for kubectl get ds after upgrades (#5433)
---
roles/win_nodes/kubernetes_patch/tasks/main.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/roles/win_nodes/kubernetes_patch/tasks/main.yml b/roles/win_nodes/kubernetes_patch/tasks/main.yml
index e81e5c79f..4430b513b 100644
--- a/roles/win_nodes/kubernetes_patch/tasks/main.yml
+++ b/roles/win_nodes/kubernetes_patch/tasks/main.yml
@@ -18,6 +18,10 @@
- name: Check current nodeselector for kube-proxy daemonset
shell: "{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf get ds kube-proxy --namespace=kube-system -o jsonpath='{.spec.template.spec.nodeSelector.beta.kubernetes.io/os}'"
register: current_kube_proxy_state
+ retries: 60
+ delay: 5
+ until: current_kube_proxy_state is succeeded
+
- name: Apply nodeselector patch for kube-proxy daemonset
shell: "{{ bin_dir }}/kubectl --kubeconfig {{ kube_config_dir }}/admin.conf patch ds kube-proxy --namespace=kube-system --type=strategic -p \"$(cat nodeselector-os-linux-patch.json)\""
--
GitLab