mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-05-07 23:50:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: check operand StatefulSet is ready before creating job (#24720)

Browse Source 
closes #24526

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
Co-authored-by: Piotr Godowski <Piotr.Godowski@pl.ibm.com>
This commit is contained in:
Steven Hawkins
2023-11-15 08:08:27 -05:00
committed by GitHub
parent 190dade456
commit b6d5083e9b
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
operator/src/main/java/org/keycloak/operator/controllers/KeycloakRealmImportController.java
+14 -1
View File
@@ -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())