Skip to content
Snippets Groups Projects
Commit 31afbc93 authored by Martin's avatar Martin
Browse files

use patchStatus instead of updateStatus

parent 5c0444ce
No related branches found
No related tags found
1 merge request!3OZG-7922 adjust Keycloak usage, build new instance instead of using a...
...@@ -63,19 +63,19 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie ...@@ -63,19 +63,19 @@ public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClie
} catch (Exception e) { } catch (Exception e) {
LOG.error(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(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build()); resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS); return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
} }
} }
private UpdateControl<OzgCloudKeycloakClient> buildStatusOk(OzgCloudKeycloakClient resource) { private UpdateControl<OzgCloudKeycloakClient> buildStatusOk(OzgCloudKeycloakClient resource) {
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build()); resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource); return UpdateControl.patchStatus(resource);
} }
private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) { private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) {
LOG.info("{} could not yet reconcile in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(), LOG.info("{} could not yet reconcile in namespace {}: {}", resource.getMetadata().getName(), resource.getMetadata().getNamespace(),
errorMessage); errorMessage);
resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build()); resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS); return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
} }
} }
...@@ -62,19 +62,19 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup ...@@ -62,19 +62,19 @@ public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup
} catch (Exception e) { } catch (Exception e) {
LOG.warn(resource.getMetadata().getName() + " could not reconcile 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()); resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS); return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
} }
} }
private UpdateControl<OzgCloudKeycloakGroup> buildStatusOk(OzgCloudKeycloakGroup resource) { private UpdateControl<OzgCloudKeycloakGroup> buildStatusOk(OzgCloudKeycloakGroup resource) {
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build()); resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource); return UpdateControl.patchStatus(resource);
} }
private UpdateControl<OzgCloudKeycloakGroup> buildStatusInProgress(OzgCloudKeycloakGroup resource, String errorMessage) { 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); errorMessage);
resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build()); resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS); return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
} }
} }
\ No newline at end of file
...@@ -53,12 +53,12 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm ...@@ -53,12 +53,12 @@ public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm
service.createOrUpdateRealm(resource.getSpec(), realmName); service.createOrUpdateRealm(resource.getSpec(), realmName);
resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build()); resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
return UpdateControl.updateStatus(resource); return UpdateControl.patchStatus(resource);
} catch (Exception e) { } catch (Exception e) {
LOG.warn(resource.getMetadata().getName() + " could not reconcile 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()); resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS); return UpdateControl.patchStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
} }
} }
......
...@@ -78,8 +78,8 @@ class UserUpdateControlBuilder { ...@@ -78,8 +78,8 @@ class UserUpdateControlBuilder {
private UpdateControl<OzgCloudKeycloakUser> buildUpdateControl() { private UpdateControl<OzgCloudKeycloakUser> buildUpdateControl() {
if (reschedule) { if (reschedule) {
return UpdateControl.updateStatus(resource).rescheduleAfter(scheduleDuration); return UpdateControl.patchStatus(resource).rescheduleAfter(scheduleDuration);
} }
return UpdateControl.updateStatus(resource); return UpdateControl.patchStatus(resource);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment