From bf78e1eb1601cfc3f798693fa837b321b530ceb4 Mon Sep 17 00:00:00 2001
From: Francisco Borges Aurindo Barros
<francisco.borges.aurindo.barros@cern.ch>
Date: Tue, 12 Mar 2024 10:07:42 +0100
Subject: [PATCH] remove redundant logical operand
---
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 4f388fbb..fcac2c14 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" && drupalSite.Labels[ssoProxyLabel] != "true") {
+ if (namespace.Labels[ssoProxyLabel] == "true" || drupalSite.Labels[sitePrimaryLabel] != "true" ) && drupalSite.Labels[ssoProxyLabel] != "true" {
drupalSite.Labels[ssoProxyLabel] = "true"
return r.updateCRorFailReconcile(ctx, log, drupalSite)
}
--
GitLab