From eef4d20b250521f7f77e57be2918979f232ad3d7 Mon Sep 17 00:00:00 2001
From: Vasvi Sharma <vasvi.sharma@cern.ch>
Date: Mon, 11 Mar 2024 14:56:02 +0100
Subject: [PATCH] Change logic to avoid infinite loop
---
controllers/drupalsite_controller.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/controllers/drupalsite_controller.go b/controllers/drupalsite_controller.go
index 30f2c76c..4f388fbb 100644
--- a/controllers/drupalsite_controller.go
+++ b/controllers/drupalsite_controller.go
@@ -246,7 +246,7 @@ func (r *DrupalSiteReconciler) Reconcile(ctx context.Context, req ctrl.Request)
if drupalSite.Labels == nil {
drupalSite.Labels = map[string]string{}
}
- if (namespace.Labels[ssoProxyLabel] == "true" && drupalSite.Labels[ssoProxyLabel] != "true") || drupalSite.Labels[sitePrimaryLabel] != "true" {
+ if (namespace.Labels[ssoProxyLabel] == "true" && drupalSite.Labels[ssoProxyLabel] != "true") || (drupalSite.Labels[sitePrimaryLabel] != "true" && drupalSite.Labels[ssoProxyLabel] != "true") {
drupalSite.Labels[ssoProxyLabel] = "true"
return r.updateCRorFailReconcile(ctx, log, drupalSite)
}
--
GitLab