From 1c1970885511bce8da9a0b3b243ff915399e1a3f Mon Sep 17 00:00:00 2001
From: Danny Bessems <danny@bessems.eu>
Date: Thu, 23 Mar 2023 16:51:17 +0100
Subject: [PATCH] Increase default retries;Add healthcheck

---
 .../bootstrap/roles/workloadcluster/tasks/clusterapi.yml      | 4 +++-
 .../firstboot/files/ansible_payload/common/vars/defaults.yml  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
index 29154cb..4281c54 100644
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/roles/workloadcluster/tasks/clusterapi.yml
@@ -99,7 +99,7 @@
         --kubeconfig {{ kubeconfig.path }}
     chdir: /opt/metacluster/cluster-api
 
-- name: Ensure CAPI/CAPV controller availability
+- name: Ensure controller availability
   kubernetes.core.k8s_info:
     kind: Deployment
     name: "{{ item.name }}"
@@ -107,6 +107,8 @@
     wait: true
     kubeconfig: "{{ kubeconfig.path }}"
   loop:
+    - name: caip-in-cluster-controller-manager
+      namespace: caip-in-cluster-system
     - name: capi-controller-manager
       namespace: capi-system
     - name: capv-controller-manager
diff --git a/ansible/roles/firstboot/files/ansible_payload/common/vars/defaults.yml b/ansible/roles/firstboot/files/ansible_payload/common/vars/defaults.yml
index 8cf3e3c..c3b1df9 100644
--- a/ansible/roles/firstboot/files/ansible_payload/common/vars/defaults.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/common/vars/defaults.yml
@@ -1,5 +1,5 @@
 playbook:
-  retries: 5
+  retries: 10
   delay:
     # These values are multiplied with the value of `storage_benchmark`
     long: 2