fix: Dex resource cleanup when .spec.dex & DISABLE_DEX is set (#922)

* Fix reconciliation when deprecated DISABLE_DEX & .spec.dex are set The secret reconciliation code doesn't respect DISABLE_DEX env var causing the entire resource reconciliation loop to break sometimes due to which the dex resources are not cleaned up properly. --------- Signed-off-by: Siddhesh Ghadi <[email protected]>
argoproj-labs · Jun 2, 2023 · 9b15d52 · 9b15d52
1 parent e09a8ee
commit 9b15d52
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/controllers/argocd/secret.go b/controllers/argocd/secret.go
@@ -29,7 +29,6 @@ import (
 	argopass "github.com/argoproj/argo-cd/v2/util/password"
 	tlsutil "github.com/operator-framework/operator-sdk/pkg/tls"
 
-	"github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	argoprojv1a1 "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	"github.com/argoproj-labs/argocd-operator/common"
 	"github.com/argoproj-labs/argocd-operator/controllers/argoutil"
@@ -184,7 +183,7 @@ func (r *ReconcileArgoCD) reconcileArgoSecret(cr *argoprojv1a1.ArgoCD) error {
 		common.ArgoCDKeyTLSPrivateKey:      tlsSecret.Data[common.ArgoCDKeyTLSPrivateKey],
 	}
 
-	if cr.Spec.Dex != nil || (cr.Spec.SSO != nil && cr.Spec.SSO.Provider == v1alpha1.SSOProviderTypeDex) {
+	if UseDex(cr) {
 		dexOIDCClientSecret, err := r.getDexOAuthClientSecret(cr)
 		if err != nil {
 			return nil
@@ -334,7 +333,7 @@ func (r *ReconcileArgoCD) reconcileExistingArgoSecret(cr *argoprojv1a1.ArgoCD, s
 		changed = true
 	}
 
-	if cr.Spec.Dex != nil || (cr.Spec.SSO != nil && cr.Spec.SSO.Provider == v1alpha1.SSOProviderTypeDex) {
+	if UseDex(cr) {
 		dexOIDCClientSecret, err := r.getDexOAuthClientSecret(cr)
 		if err != nil {
 			return err