fix: create reconciler if new sub resources are added (#344)

DoodleScheduling · Dec 6, 2024 · f0c9742 · f0c9742
1 parent ac17b6c
commit f0c9742
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/api/v1beta1/keycloakrealm_types.go b/api/v1beta1/keycloakrealm_types.go
@@ -143,6 +143,9 @@ type KeycloakRealmStatus struct {
 	// ObservedGeneration is the last generation reconciled by the controller
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 
+	// ObservedSHA256 is the last realm checksum reconciled by the controller
+	ObservedSHA256 string `json:"observedSHA256,omitempty"`
+
 	// Reconciler is the reconciler pod while a reconciliation is in progress
 	Reconciler string `json:"reconciler,omitempty"`
 

diff --git a/chart/keycloak-controller/crds/keycloak.infra.doodle.com_keycloakrealms.yaml b/chart/keycloak-controller/crds/keycloak.infra.doodle.com_keycloakrealms.yaml
@@ -9571,6 +9571,10 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256:
+                description: ObservedSHA256 is the last realm checksum reconciled
+                  by the controller
+                type: string
               reconciler:
                 description: Reconciler is the reconciler pod while a reconciliation
                   is in progress

diff --git a/config/base/crd/bases/keycloak.infra.doodle.com_keycloakrealms.yaml b/config/base/crd/bases/keycloak.infra.doodle.com_keycloakrealms.yaml
@@ -9571,6 +9571,10 @@ spec:
                   by the controller
                 format: int64
                 type: integer
+              observedSHA256:
+                description: ObservedSHA256 is the last realm checksum reconciled
+                  by the controller
+                type: string
               reconciler:
                 description: Reconciler is the reconciler pod while a reconciliation
                   is in progress

diff --git a/internal/controllers/keycloakrealm_controller.go b/internal/controllers/keycloakrealm_controller.go
@@ -334,7 +334,7 @@ func (r *KeycloakRealmReconciler) reconcile(ctx context.Context, realm infrav1be
 	}
 
 	// rate limiter
-	if readyCondition != nil && readyCondition.Status == metav1.ConditionTrue && (realm.Spec.Interval == nil || time.Since(readyCondition.LastTransitionTime.Time) < realm.Spec.Interval.Duration) && realm.Generation == readyCondition.ObservedGeneration {
+	if readyCondition != nil && readyCondition.Status == metav1.ConditionTrue && (realm.Spec.Interval == nil || time.Since(readyCondition.LastTransitionTime.Time) < realm.Spec.Interval.Duration) && checksum == realm.Status.ObservedSHA256 {
 		logger.V(1).Info("skip reconciliation, last transition time too recent")
 
 		if realm.Spec.Interval != nil {
@@ -346,6 +346,8 @@ func (r *KeycloakRealmReconciler) reconcile(ctx context.Context, realm infrav1be
 		}
 	}
 
+	realm.Status.ObservedSHA256 = checksum
+
 	// handle reconciler pod state
 	if podErr == nil && pod.Name != "" {
 		return r.handlerReconcilerState(realm, pod, logger)