From 1609b48e8fccf5cfeedea37de368c314bf825c74 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Thu, 8 May 2025 18:05:44 +0200
Subject: [PATCH] OZG-7922 adjust level of LOGs
---
.../keycloak/client/KeycloakClientReconciler.java | 5 ++---
.../keycloak/group/KeycloakGroupReconciler.java | 4 ++--
.../keycloak/realm/KeycloakRealmReconciler.java | 12 ++++++------
.../keycloak/realm/KeycloakRealmService.java | 2 +-
.../keycloak/user/KeycloakUserReconciler.java | 12 ++++++------
.../keycloak/user/KubernetesRemoteService.java | 2 +-
6 files changed, 18 insertions(+), 19 deletions(-)
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 9b3289b..62e7c9d 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
@@ -48,9 +48,8 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
@Override
public UpdateControl<OzgCloudKeycloakClient> reconcile(OzgCloudKeycloakClient resource, Context<OzgCloudKeycloakClient> context) {
-
try {
- LOG.info("{} reconciling...", resource.getMetadata().getName());
+ LOG.debug("{} reconciling...", resource.getMetadata().getName());
Optional<String> preconditionError = preconditionService.getReconcilePreconditionErrors(resource);
if (preconditionError.isPresent()) {
@@ -73,7 +72,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
}
private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) {
- LOG.info("{} could not yet reconcile in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
+ LOG.warn("{} 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.patchStatus(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 ac0cb71..db95a29 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("{} reconiling..", resource.getMetadata().getName());
+ LOG.debug("{} 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(resource.getMetadata().getName() + " could not reconcile in namespace " + resource.getMetadata().getNamespace(), e);
+ LOG.error(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.patchStatus(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 7bcd5e0..893765d 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,7 +46,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
@Override
public UpdateControl<OzgCloudKeycloakRealm> reconcile(OzgCloudKeycloakRealm resource, Context<OzgCloudKeycloakRealm> context) {
- LOG.info("{} reconciling...", resource.getMetadata().getName());
+ LOG.debug("{} reconciling...", resource.getMetadata().getName());
try {
var realmName = resource.getMetadata().getNamespace();
@@ -56,7 +56,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
return UpdateControl.patchStatus(resource);
} catch (Exception e) {
- LOG.warn(resource.getMetadata().getName() + " could not reconcile in namespace " + resource.getMetadata().getNamespace(), e);
+ LOG.error(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.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
@@ -64,9 +64,9 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
@Override
public DeleteControl cleanup(OzgCloudKeycloakRealm realm, Context<OzgCloudKeycloakRealm> context) {
- LOG.info("{} cleanup...", realm.getMetadata().getName());
+ LOG.debug("{} cleanup...", realm.getMetadata().getName());
if (realm.getSpec().isKeepAfterDelete()) {
- LOG.info("keep data");
+ LOG.debug("keep data");
return DeleteControl.defaultDelete();
}
if (!service.realmExists(realm.getMetadata().getNamespace())) {
@@ -77,12 +77,12 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
DeleteControl deleteRealm(OzgCloudKeycloakRealm realm) {
var realmName = realm.getMetadata().getNamespace();
- LOG.info("{} do cleanup...", realmName);
+ LOG.debug("{} do cleanup...", realmName);
try {
service.deleteRealm(realmName);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn(realmName + " could not delete.", e);
+ LOG.error(realmName + " could not delete.", e);
return DeleteControl.noFinalizerRemoval().rescheduleAfter(Config.RECONCILER_RETRY_SECONDS_ON_ERROR);
}
}
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 5d97506..4d46b91 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
@@ -63,7 +63,7 @@ class KeycloakRealmService {
remoteService.updateRealm(realmRepresentation);
addUserProfileAttributes(realmRepresentation);
} catch (Exception e) {
- LOG.warn(existingRealm + ": Updating existing realm failed: ", e);
+ LOG.error(existingRealm + ": Updating existing realm failed: ", e);
throw e;
}
}
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 233a526..bfadca9 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
@@ -50,7 +50,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
var userName = resource.getMetadata().getName();
var namespace = resource.getMetadata().getNamespace();
- LOG.info("{} reconciling...", userName);
+ LOG.debug("{} reconciling...", userName);
try {
var preconditionError = preconditionService.getPreconditionErrors(resource);
@@ -71,7 +71,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCloudCustomResourceStatus.OK).build();
} catch (Exception e) {
- LOG.warn(userName + " could not reconcile in namespace " + namespace, e);
+ LOG.error(userName + " could not reconcile in namespace " + namespace, e);
return UserUpdateControlBuilder.fromResource(resource)
.withStatus(OzgCloudCustomResourceStatus.ERROR)
@@ -83,9 +83,9 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
@Override
public DeleteControl cleanup(OzgCloudKeycloakUser user, Context<OzgCloudKeycloakUser> context) {
- LOG.info("{} cleanup...", user.getMetadata().getName());
+ LOG.debug("{} cleanup...", user.getMetadata().getName());
if (user.getSpec().isKeepAfterDelete()) {
- LOG.info("keep data");
+ LOG.debug("keep data");
return DeleteControl.defaultDelete();
}
@@ -99,12 +99,12 @@ public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>,
DeleteControl deleteUser(OzgCloudKeycloakUser user) {
var userName = user.getMetadata().getName();
var namespace = user.getMetadata().getNamespace();
- LOG.info("{} do cleanup...", userName);
+ LOG.debug("{} do cleanup...", userName);
try {
service.deleteUser(user.getSpec(), namespace);
return DeleteControl.defaultDelete();
} catch (Exception e) {
- LOG.warn(userName + " could not delete user in namespace " + namespace, e);
+ LOG.error(userName + " could not delete user in namespace " + namespace, e);
return DeleteControl.noFinalizerRemoval().rescheduleAfter(Config.RECONCILER_RETRY_SECONDS_ON_ERROR);
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KubernetesRemoteService.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KubernetesRemoteService.java
index e3e941d..e352b0c 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KubernetesRemoteService.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/KubernetesRemoteService.java
@@ -39,7 +39,7 @@ class KubernetesRemoteService {
private final KubernetesClient kubernetesClient;
public Resource<Secret> getSecret(String namespace, String name) {
- LOG.info("KubernetesClient: Get {} secret from {} namespace.", name, namespace);
+ LOG.debug("KubernetesClient: Get {} secret from {} namespace.", name, namespace);
return kubernetesClient.secrets().inNamespace(namespace).withName(name);
}
}
--
GitLab