Add cert-manager wait to start properly (#30)

Signed-off-by: David Kornel <[email protected]>
streamshub · Aug 29, 2024 · f959d41 · f959d41
1 parent d8f440b
commit f959d41
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java b/src/main/java/io/streams/operators/manifests/CertManagerManifestInstaller.java
@@ -23,6 +23,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.LockSupport;
 
 /**
  * Installer of Cert-manager using yaml manifests files
@@ -36,6 +38,8 @@ public class CertManagerManifestInstaller {
      * Deployment name for Cert-manager
      */
     public static final String DEPLOYMENT_NAME = "cert-manager";
+    public static final String WEBHOOK_DEPLOYMENT_NAME = "cert-manager-webhook";
+    public static final String CA_INJECTION_DEPLOYMENT_NAME = "cert-manager-cainjector";
 
     /**
      * Operator namespace
@@ -83,7 +87,12 @@ public static CompletableFuture<Void> install() throws IOException {
 
     private static boolean isReady() {
         if (KubeResourceManager.getKubeClient().getClient().apps()
-            .deployments().inNamespace(OPERATOR_NS).withName(DEPLOYMENT_NAME).isReady()) {
+            .deployments().inNamespace(OPERATOR_NS).withName(DEPLOYMENT_NAME).isReady() &&
+            KubeResourceManager.getKubeClient().getClient().apps()
+                .deployments().inNamespace(OPERATOR_NS).withName(WEBHOOK_DEPLOYMENT_NAME).isReady() &&
+            KubeResourceManager.getKubeClient().getClient().apps()
+                .deployments().inNamespace(OPERATOR_NS).withName(CA_INJECTION_DEPLOYMENT_NAME).isReady()) {
+            LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(60));
             LOGGER.info("Cert-manager {}/{} is ready", OPERATOR_NS, DEPLOYMENT_NAME);
             return true;
         } else {

diff --git a/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java b/src/test/java/io/streams/e2e/flink/sql/SqlExampleST.java
@@ -46,8 +46,8 @@ void prepareOperators() throws IOException {
 
         CompletableFuture.allOf(
             StrimziManifestInstaller.install(),
-            FlinkManifestInstaller.install(),
-            ApicurioRegistryManifestInstaller.install()).join();
+            ApicurioRegistryManifestInstaller.install(),
+            FlinkManifestInstaller.install()).join();
     }
 
     @Test