From b6d5083e9bd0c67bc7f620cdd77f188d0f695c26 Mon Sep 17 00:00:00 2001
From: Steven Hawkins <shawkins@redhat.com>
Date: Wed, 15 Nov 2023 08:08:27 -0500
Subject: [PATCH] fix: check operand StatefulSet is ready before creating job
 (#24720)

closes #24526

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
Co-authored-by: Piotr Godowski <Piotr.Godowski@pl.ibm.com>
---
 .../KeycloakRealmImportController.java        | 15 ++++++++-
 .../integration/RealmImportTest.java          | 31 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
index 0bdbb845c00..60fe705eb2c 100644
--- a/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
+++ b/operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
@@ -17,6 +17,7 @@
 package org.keycloak.operator.controllers;
 
 import io.fabric8.kubernetes.api.model.apps.StatefulSet;
+import io.fabric8.kubernetes.api.model.apps.StatefulSetStatus;
 import io.fabric8.kubernetes.api.model.batch.v1.Job;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -37,6 +38,7 @@ import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatus
 import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImportStatusCondition;
 
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import jakarta.inject.Inject;
@@ -74,7 +76,9 @@ public class KeycloakRealmImportController implements Reconciler<KeycloakRealmIm
 
         if (existingDeployment != null) {
             context.managedDependentResourceContext().put(StatefulSet.class, existingDeployment);
-            jobDependentResource.reconcile(realm, context);
+            if (getReadyReplicas(existingDeployment) > 0) {
+                jobDependentResource.reconcile(realm, context);
+            }
         }
 
         updateStatus(statusBuilder, realm, existingJob, existingDeployment);
@@ -118,6 +122,11 @@ public class KeycloakRealmImportController implements Reconciler<KeycloakRealmIm
             return;
         }
 
+        if (getReadyReplicas(existingDeployment) < 1) {
+            status.addErrorMessage("Deployment not yet ready, waiting for it to be ready");
+            return;
+        }
+
         if (existingJob == null) {
             Log.info("Job about to start");
             status.addStartedMessage("Import Job will start soon");
@@ -145,6 +154,10 @@ public class KeycloakRealmImportController implements Reconciler<KeycloakRealmIm
         }
     }
 
+    private Integer getReadyReplicas(StatefulSet existingDeployment) {
+        return Optional.ofNullable(existingDeployment.getStatus()).map(StatefulSetStatus::getReadyReplicas).orElse(0);
+    }
+
     private void rollingRestart(KeycloakRealmImport realmCR) {
         client.apps().statefulSets()
                 .inNamespace(realmCR.getMetadata().getNamespace())
diff --git a/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java b/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
index 4b12de7d113..d5f89ef3abe 100644
--- a/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
+++ b/operator/src/test/java/org/keycloak/operator/testsuite/integration/RealmImportTest.java
@@ -27,6 +27,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.keycloak.operator.controllers.KeycloakServiceDependentResource;
+import org.keycloak.operator.crds.v2alpha1.deployment.Keycloak;
 import org.keycloak.operator.crds.v2alpha1.realmimport.KeycloakRealmImport;
 import org.keycloak.operator.testsuite.utils.CRAssert;
 import org.keycloak.operator.testsuite.utils.K8sUtils;
@@ -195,4 +196,34 @@ public class RealmImportTest extends BaseOperatorTest {
                 });
     }
 
+    @Test
+    public void testFailedRealmImportWhenKeycloakNotAvailable() {
+        // Arrange
+        Keycloak kc = getTestKeycloakDeployment(true);
+        kc.getSpec().setInstances(0);
+
+        // don't wait for Keycloak being available, since it has no instances
+        deployKeycloak(k8sclient, kc, false);
+
+        // Act
+        K8sUtils.set(k8sclient, getClass().getResourceAsStream("/example-realm.yaml"));
+
+        var crSelector = k8sclient
+                .resources(KeycloakRealmImport.class)
+                .inNamespace(namespace)
+                .withName("example-count0-kc");
+
+        // Assert
+        Awaitility.await()
+                .atMost(3, MINUTES)
+                .pollDelay(5, SECONDS)
+                .ignoreExceptions()
+                .untilAsserted(() -> {
+                    KeycloakRealmImport keycloak = crSelector.get();
+                    CRAssert.assertKeycloakRealmImportStatusCondition(keycloak, DONE, false);
+                    CRAssert.assertKeycloakRealmImportStatusCondition(keycloak, STARTED, false);
+                    CRAssert.assertKeycloakRealmImportStatusCondition(keycloak, HAS_ERRORS, true);
+                });
+    }
+
 }