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 a487918d442a6ccebbf086f03f1902d6fbb481af..77e2aca9ce6d358e181039009b970ee909cd9923 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 0be76609e7cc738c5a6c2c98536f0d6a3daac10d..9b3289bd64b0df64a03464937224ff355dbb814c 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 6c0f7938566db11255ce636bab9e8c24b82e7f63..ac0cb71be160c8321bd275744b7be04b2e9d6e8a 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 96d75914ed1f932699358839a6f8f3d371c6f30e..c95071653007632d85c943c1653dc96bceabbf17 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 0301c7fcd7040daf43230c9d8de8524ad6f5f496..55f8405b4fd1dafb7e5ba8d6d44d9837a1b58c94 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); } }