diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
index 5c7c8a7fa0ee74aacf809d6c30d92397c1fbefe7..a4c174f7147e0abd32007d20e16662f8e337fac5 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
@@ -50,7 +50,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
public UpdateControl<OzgCloudKeycloakClient> reconcile(OzgCloudKeycloakClient resource, Context<OzgCloudKeycloakClient> context) {
try {
- LOG.info("Reconcile KeycloakClient {}.", resource.getMetadata().getName());
+ LOG.info("{} reconciling...", resource.getMetadata().getName());
Optional<String> preconditionError = preconditionService.getReconcilePreconditionErrors(resource);
if (preconditionError.isPresent()) {
@@ -61,7 +61,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
return buildStatusOk(resource);
} catch (Exception e) {
- LOG.error("Could not reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
+ LOG.error(resource.getMetadata().getName() + " could not reconcile in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
@@ -73,7 +73,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
}
private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) {
- LOG.info("Could not yet reconcile client {} in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
+ LOG.info("{} could not yet reconcile in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
errorMessage);
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
index c2c483d954ae6307d68dbc5fbdde8e29699137d3..3eea1b1ec467aa1e041e906709f1a31e6bd1bb29 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
@@ -49,7 +49,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
@Override
public UpdateControl<OzgCloudKeycloakGroup> reconcile(OzgCloudKeycloakGroup resource, Context<OzgCloudKeycloakGroup> context) {
try {
- LOG.info("Reconcile KeycloakGroup {}.", resource.getMetadata().getName());
+ LOG.info("{} reconiling..", resource.getMetadata().getName());
Optional<String> preconditionError = preconditionService.getReconcilePreconditionErrors(resource);
if (preconditionError.isPresent()) {
@@ -60,7 +60,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
return buildStatusOk(resource);
} catch (Exception e) {
- LOG.warn("Could not reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
+ LOG.warn(resource.getMetadata().getName() + " could not reconcile in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
@@ -72,7 +72,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
}
private UpdateControl<OzgCloudKeycloakGroup> buildStatusInProgress(OzgCloudKeycloakGroup resource, String errorMessage) {
- LOG.warn("Could not yet reconcile group {} in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
+ LOG.warn("{} could not yet reconcile group in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
errorMessage);
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
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 6b9ad2740ff0fae0a1f439282c7420f26588d08f..dc3e333e5b42269e4cfe2ec8a00418b676ef595b 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
@@ -46,19 +46,17 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
@Override
public UpdateControl<OzgCloudKeycloakRealm> reconcile(OzgCloudKeycloakRealm resource, Context<OzgCloudKeycloakRealm> context) {
- LOG.info("Realm reconciler reconcile, keep after delete is set to: {}", resource.getSpec().isKeepAfterDelete());
+ LOG.info("{} reconciling...", resource.getMetadata().getName());
try {
var realmName = resource.getMetadata().getNamespace();
- LOG.info("Reconcile KeycloakRealm {} (crd name {} )", realmName, resource.getMetadata().getName());
-
service.createRealm(resource.getSpec(), realmName);
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource);
} catch (Exception e) {
- LOG.warn("Could not reconcile realm " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace(), e);
+ LOG.warn(resource.getMetadata().getName() + " could not reconcile in namespace " + resource.getMetadata().getNamespace(), e);
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
@@ -66,8 +64,9 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
@Override
public DeleteControl cleanup(OzgCloudKeycloakRealm realm, Context<OzgCloudKeycloakRealm> context) {
- LOG.info("Realm reconciler cleanup, keep after delete is set to: {}.", realm.getSpec().isKeepAfterDelete());
+ LOG.info("{} cleanup...", realm.getMetadata().getName());
if (realm.getSpec().isKeepAfterDelete()) {
+ LOG.info("keep data");
return DeleteControl.defaultDelete();
}
return cleanup(realm);
@@ -75,12 +74,12 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
DeleteControl cleanup(OzgCloudKeycloakRealm realm) {
var realmName = realm.getMetadata().getNamespace();
- LOG.info("Deleting KeycloakRealm {}.", realmName);
+ LOG.info("{} do cleanup...", realmName);
try {
service.deleteRealm(realmName);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn("Could not delete KeycloakRealm " + realmName, e);
+ LOG.warn(realmName + " could not delete.", e);
return DeleteControl.defaultDelete();
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
index e1bcb947152babf2c4d9059fed87a7630dec964e..6470b4e9c9d664629b23c18b2cbea9694f338cf5 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -23,8 +23,6 @@
*/
package de.ozgcloud.operator.keycloak.user;
-import javax.ws.rs.NotFoundException;
-
import org.springframework.stereotype.Component;
import de.ozgcloud.operator.Config;
@@ -52,15 +50,14 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
var userName = resource.getMetadata().getName();
var namespace = resource.getMetadata().getNamespace();
- LOG.info("Reconciling user {}.--", userName);
- LOG.info("User reconciler reconcile, keep after delete is set to: {}.", resource.getSpec().isKeepAfterDelete());
+ LOG.info("{} reconciling...", userName);
try {
var preconditionError = preconditionService.getPreconditionErrors(resource);
if (preconditionError.isPresent()) {
var errorMessage = preconditionError.get();
- LOG.warn("Could not reconcile user {} in namespace {}: {}.", userName, namespace, errorMessage);
+ LOG.warn("{} could not reconcile in namespace {}: {}.", userName, namespace, errorMessage);
return UserUpdateControlBuilder.fromResource(resource)
.withStatus(OzgCloudCustomResourceStatus.IN_PROGRESS)
@@ -74,13 +71,11 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCloudCustomResourceStatus.OK).build();
} catch (Exception e) {
- var errorMessage = e.getMessage();
-
- LOG.warn("Could not reconcile user " + userName + " for namespace " + namespace, e);
+ LOG.warn(userName + " could not reconcile in namespace " + namespace, e);
return UserUpdateControlBuilder.fromResource(resource)
.withStatus(OzgCloudCustomResourceStatus.ERROR)
- .withMessage(errorMessage)
+ .withMessage(e.getMessage())
.withReschedule(Config.RECONCILER_RETRY_SECONDS_ON_ERROR)
.build();
}
@@ -88,8 +83,9 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
@Override
public DeleteControl cleanup(OzgCloudKeycloakUser user, Context<OzgCloudKeycloakUser> context) {
- LOG.info("User reconciler cleanup, keep after delete is set to: {}.", user.getSpec().isKeepAfterDelete());
+ LOG.info("{} cleanup...", user.getMetadata().getName());
if (user.getSpec().isKeepAfterDelete()) {
+ LOG.info("keep data");
return DeleteControl.defaultDelete();
}
return cleanup(user);
@@ -98,15 +94,12 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
DeleteControl cleanup(OzgCloudKeycloakUser user) {
var userName = user.getMetadata().getName();
var namespace = user.getMetadata().getNamespace();
- LOG.info("Deleting KeycloakUser {}.", userName);
+ LOG.info("{} do cleanup...", userName);
try {
service.deleteUser(user.getSpec(), namespace);
return DeleteControl.defaultDelete();
- } catch (NotFoundException e) {
- LOG.info("Could not delete user " + userName + " in namespace " + namespace + " user not found.", e);
- return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn("Could not delete user " + userName + " in namespace " + namespace, e);
+ LOG.warn(userName + " could not delete user in namespace " + namespace, e);
return DeleteControl.defaultDelete();
}
}