From 951f89eaa658cd1b026f87dec39e8e5d6d6d0c5e Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Mon, 10 Mar 2025 09:22:31 +0100
Subject: [PATCH] adjust update logik to patch status only
---
.../operator/OzgCloudElasticsearchUpdateControlBuilder.java | 4 ++--
.../operator/keycloak/client/KeycloakClientReconciler.java | 6 +++---
.../operator/keycloak/group/KeycloakGroupReconciler.java | 6 +++---
.../operator/keycloak/realm/KeycloakRealmReconciler.java | 4 ++--
.../operator/keycloak/user/UserUpdateControlBuilder.java | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchUpdateControlBuilder.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchUpdateControlBuilder.java
index a487918..77e2aca 100644
--- a/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchUpdateControlBuilder.java
+++ b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchUpdateControlBuilder.java
@@ -78,8 +78,8 @@ class OzgCloudElasticsearchUpdateControlBuilder {
private UpdateControl<OzgCloudElasticsearchCustomResource> buildUpdateControl() {
if (reschedule) {
- return UpdateControl.patchResourceAndStatus(resource).rescheduleAfter(scheduleDuration);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(scheduleDuration);
}
- return UpdateControl.patchResourceAndStatus(resource);
+ return UpdateControl.patchStatus(resource);
}
}
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 0be7660..9b3289b 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
@@ -63,19 +63,19 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
} catch (Exception 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.patchResourceAndStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
private UpdateControl<OzgCloudKeycloakClient> buildStatusOk(OzgCloudKeycloakClient resource) {
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
- return UpdateControl.patchResourceAndStatus(resource);
+ return UpdateControl.patchStatus(resource);
}
private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) {
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.patchResourceAndStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
+ 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 6c0f793..ac0cb71 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
@@ -62,19 +62,19 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
} catch (Exception 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.patchResourceAndStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
private UpdateControl<OzgCloudKeycloakGroup> buildStatusOk(OzgCloudKeycloakGroup resource) {
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
- return UpdateControl.patchResourceAndStatus(resource);
+ return UpdateControl.patchStatus(resource);
}
private UpdateControl<OzgCloudKeycloakGroup> buildStatusInProgress(OzgCloudKeycloakGroup resource, String errorMessage) {
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.patchResourceAndStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
\ No newline at end of file
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 96d7591..c950716 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
@@ -55,12 +55,12 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null)
.observedGeneration(resource.getMetadata().getGeneration())
.build());
- return UpdateControl.patchResourceAndStatus(resource);
+ return UpdateControl.patchStatus(resource);
} catch (Exception 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.patchResourceAndStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
}
}
diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
index 0301c7f..55f8405 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
@@ -78,8 +78,8 @@ class UserUpdateControlBuilder {
private UpdateControl<OzgCloudKeycloakUser> buildUpdateControl() {
if (reschedule) {
- return UpdateControl.patchResourceAndStatus(resource).rescheduleAfter(scheduleDuration);
+ return UpdateControl.patchStatus(resource).rescheduleAfter(scheduleDuration);
}
- return UpdateControl.patchResourceAndStatus(resource);
+ return UpdateControl.patchStatus(resource);
}
}
--
GitLab