diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java index 716231c5a93dca4ca83a8df79a71b16414fb2d17..51bb10bbe65ef38ab289593d39f95bdb76072ab9 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java @@ -51,7 +51,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm var realmName = resource.getMetadata().getNamespace(); service.createRealm(resource.getSpec(), realmName); - service.createOrUpdateRealm(resource.getSpec(), resource.getMetadata().getNamespace()); + service.createOrUpdateRealm(resource.getSpec(), realmName); resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build()); return UpdateControl.updateStatus(resource); diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java index f66eea94d55acaf604c8ce56706ad29d2d42ec6c..44193ee499523addbfefbaea2ded6b95630ffa54 100644 --- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java +++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java @@ -30,7 +30,9 @@ import org.springframework.stereotype.Component; import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService; import lombok.RequiredArgsConstructor; +import lombok.extern.log4j.Log4j2; +@Log4j2 @RequiredArgsConstructor @Component class KeycloakRealmService { @@ -56,19 +58,25 @@ class KeycloakRealmService { } void updateRealm(RealmRepresentation existingRealm, OzgCloudKeycloakRealmSpec spec) { - var realmRepresentation = mapper.update(existingRealm, spec); - remoteService.updateRealm(realmRepresentation); - //addOrUpdateRealmRoles(spec, existingRealm.getRealm()); - } + try { + LOG.debug("{}: Updating existing realm...", existingRealm); + var realmRepresentation = mapper.update(existingRealm, spec); + remoteService.updateRealm(realmRepresentation); + } catch (Exception e) { + LOG.warn(existingRealm + ": Updating existing realm failed: ", e); + throw e; + + } + // addOrUpdateRealmRoles(spec, existingRealm.getRealm()); + } RealmRepresentation addRealmName(RealmRepresentation realm, String realmName) { realm.setRealm(realmName); return realm; } - public void deleteRealm(String realmName) { remoteService.deleteRealm(realmName); }