salt: wait for cert-manager before installing OLM

eg-ayoub · eg-ayoub · commit 192330051c95 · 2025-01-30T15:26:01.000+01:00
diff --git a/salt/metalk8s/addons/cert-manager/deployed/init.sls b/salt/metalk8s/addons/cert-manager/deployed/init.sls
@@ -1,3 +1,39 @@
 include:
   - .namespace
   - .chart
+
+Wait for cert-manager deployment to be Ready:
+  test.configurable_test_state:
+    - changes: False
+    - result: __slot__:salt:metalk8s_kubernetes.check_object_ready(
+        apiVersion=apps/v1, kind=Deployment,
+        name=cert-manager, namespace=metalk8s-certs)
+    - comment: wait for cert-manager
+    - retry:
+        attempts: 30
+    - require:
+      - sls: metalk8s.addons.cert-manager.deployed.chart
+
+Wait for cert-manager webhook to be Ready:
+  test.configurable_test_state:
+    - changes: False
+    - result: __slot__:salt:metalk8s_kubernetes.check_object_ready(
+        apiVersion=apps/v1, kind=Deployment,
+        name=cert-manager-webhook, namespace=metalk8s-certs)
+    - comment: wait for cert-manager-webhook
+    - retry:
+        attempts: 30
+    - require:
+      - sls: metalk8s.addons.cert-manager.deployed.chart
+
+Wait for cert-manager cainjector to be Ready:
+  test.configurable_test_state:
+    - changes: False
+    - result: __slot__:salt:metalk8s_kubernetes.check_object_ready(
+        apiVersion=apps/v1, kind=Deployment,
+        name=cert-manager-cainjector, namespace=metalk8s-certs)
+    - comment: wait for cert-manager-cainjector
+    - retry:
+        attempts: 30
+    - require:
+      - sls: metalk8s.addons.cert-manager.deployed.chart
diff --git a/salt/metalk8s/addons/olm/deployed/init.sls b/salt/metalk8s/addons/olm/deployed/init.sls
@@ -1,4 +1,5 @@
 include:
+  - metalk8s.addons.cert-manager.deployed
   - .chart
 
 Wait for the Catalogd Controller Manager deployment to be Ready:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`include:`
	`2`	`+ - metalk8s.addons.cert-manager.deployed`
`2`	`3`	`- .chart`
`3`	`4`
`4`	`5`	`Wait for the Catalogd Controller Manager deployment to be Ready:`