From 0627acda44ae810c2f74ea8a31e6243d1ebf752b Mon Sep 17 00:00:00 2001
From: Waldek Maleska <waldekm@speechmatics.com>
Date: Tue, 20 Jun 2023 17:34:33 +0100
Subject: [PATCH 1/2] add missing 'until' condition in control plane setup

---
 tasks/control-plane-setup.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml
index 267b94b..0cf46b7 100644
--- a/tasks/control-plane-setup.yml
+++ b/tasks/control-plane-setup.yml
@@ -50,6 +50,7 @@
   register: flannel_result
   changed_when: "'created' in flannel_result.stdout"
   when: kubernetes_pod_network.cni == 'flannel'
+  until: flannel_result is not failed
   retries: 3
   delay: 5
 
@@ -58,6 +59,7 @@
   register: calico_result
   changed_when: "'created' in calico_result.stdout"
   when: kubernetes_pod_network.cni == 'calico'
+  until: calico_result is not failed
   retries: 3
   delay: 5
 
@@ -66,6 +68,7 @@
   changed_when: false
   register: kubectl_version
   when: kubernetes_pod_network.cni == 'weave'
+  until: kubectl_version is not failed
   retries: 3
   delay: 5
 

From 3355986a18b1b5f0895718d95687e72f754e0ee0 Mon Sep 17 00:00:00 2001
From: Waldek Maleska <waldekm@speechmatics.com>
Date: Tue, 20 Jun 2023 17:39:13 +0100
Subject: [PATCH 2/2] increase networking tasks timeouts

---
 tasks/control-plane-setup.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/control-plane-setup.yml b/tasks/control-plane-setup.yml
index 0cf46b7..41efc9e 100644
--- a/tasks/control-plane-setup.yml
+++ b/tasks/control-plane-setup.yml
@@ -51,7 +51,7 @@
   changed_when: "'created' in flannel_result.stdout"
   when: kubernetes_pod_network.cni == 'flannel'
   until: flannel_result is not failed
-  retries: 3
+  retries: 12
   delay: 5
 
 - name: Configure Calico networking.
@@ -60,7 +60,7 @@
   changed_when: "'created' in calico_result.stdout"
   when: kubernetes_pod_network.cni == 'calico'
   until: calico_result is not failed
-  retries: 3
+  retries: 12
   delay: 5
 
 - name: Get Kubernetes version for Weave installation.
@@ -69,7 +69,7 @@
   register: kubectl_version
   when: kubernetes_pod_network.cni == 'weave'
   until: kubectl_version is not failed
-  retries: 3
+  retries: 12
   delay: 5
 
 - name: Configure Weave networking.