undo small changes to old code

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>

api/v1alpha1/argocd_types.go

@@ -984,7 +984,7 @@ func (a *ArgoCD) ApplicationInstanceLabelKey() string {
 	if a.Spec.ApplicationInstanceLabelKey != "" {
 		return a.Spec.ApplicationInstanceLabelKey
 	} else {
-		return common.AppK8sKeyInstance
+		return common.ArgoCDDefaultApplicationInstanceLabelKey
 	}
 }
 

api/v1alpha1/argocd_types_test.go

@@ -13,7 +13,7 @@ func Test_ArgoCD_ApplicationInstanceLabelKey(t *testing.T) {
 	cr.Spec.ApplicationInstanceLabelKey = "my.corp/instance"
 	assert.Equal(t, cr.ApplicationInstanceLabelKey(), "my.corp/instance")
 	cr = &ArgoCD{}
-	assert.Equal(t, cr.ApplicationInstanceLabelKey(), common.AppK8sKeyInstance)
+	assert.Equal(t, cr.ApplicationInstanceLabelKey(), common.ArgoCDDefaultApplicationInstanceLabelKey)
 }
 
 func Test_ResourceTrackingMethodToString(t *testing.T) {

common/defaults.go

@@ -39,7 +39,7 @@ const (
 	ArgoCDDefaultAdminPasswordNumSymbols = 0
 
 	// ArgoCDDefaultApplicationInstanceLabelKey is the default app name as a tracking label.
-	ArgoCDDefaultApplicationInstanceLabelKey = "app.kubernetes.io/instance"
+	ArgoCDDefaultApplicationInstanceLabelKey = AppK8sKeyInstance
 
 	// ArgoCDDefaultArgoImage is the ArgoCD container image to use when not specified.
 	ArgoCDDefaultArgoImage = "quay.io/argoproj/argocd"

controllers/argocd/TOBEREMOVED_test.go

@@ -22,6 +22,13 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
+func makeTestReconciler(client client.Client, sch *runtime.Scheme) *ReconcileArgoCD {
+	return &ReconcileArgoCD{
+		Client: client,
+		Scheme: sch,
+	}
+}
+
 func createNamespace(r *ReconcileArgoCD, n string, managedBy string) error {
 	ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: n}}
 	if managedBy != "" {
@@ -50,6 +57,28 @@ func createNamespaceManagedByClusterArgoCDLabel(r *ReconcileArgoCD, n string, ma
 	return r.Client.Create(context.TODO(), ns)
 }
 
+func stringMapKeys(m map[string]string) []string {
+	r := []string{}
+	for k := range m {
+		r = append(r, k)
+	}
+	sort.Strings(r)
+	return r
+}
+
+func merge(base map[string]string, diff map[string]string) map[string]string {
+	result := make(map[string]string)
+
+	for k, v := range base {
+		result[k] = v
+	}
+	for k, v := range diff {
+		result[k] = v
+	}
+
+	return result
+}
+
 func TestReconcileNotifications_CreateRoles(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(func(a *argoproj.ArgoCD) {

controllers/argocd/configmap.go

@@ -60,7 +60,7 @@ func getCAConfigMapName(cr *argoproj.ArgoCD) string {
 	if len(cr.Spec.TLS.CA.ConfigMapName) > 0 {
 		return cr.Spec.TLS.CA.ConfigMapName
 	}
-	return argoutil.NameWithSuffix(cr.Name, common.ArgoCDCASuffix)
+	return nameWithSuffix(common.ArgoCDCASuffix, cr)
 }
 
 // getSCMRootCAConfigMapName will return the SCMRootCA ConfigMap name for the given ArgoCD ApplicationSet Controller.
@@ -292,7 +292,7 @@ func newConfigMap(cr *argoproj.ArgoCD) *corev1.ConfigMap {
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      cr.Name,
 			Namespace: cr.Namespace,
-			Labels:    common.DefaultLabels(cr.Name),
+			Labels:    argoutil.LabelsForCluster(cr),
 		},
 	}
 }
@@ -303,7 +303,7 @@ func newConfigMapWithName(name string, cr *argoproj.ArgoCD) *corev1.ConfigMap {
 	cm.ObjectMeta.Name = name
 
 	lbls := cm.ObjectMeta.Labels
-	lbls[common.AppK8sKeyName] = name
+	lbls[common.ArgoCDKeyName] = name
 	cm.ObjectMeta.Labels = lbls
 
 	return cm
@@ -363,7 +363,7 @@ func (r *ReconcileArgoCD) reconcileCAConfigMap(cr *argoproj.ArgoCD) error {
 	}
 
 	cm.Data = map[string]string{
-		corev1.TLSCertKey: string(caSecret.Data[corev1.TLSCertKey]),
+		common.ArgoCDKeyTLSCert: string(caSecret.Data[common.ArgoCDKeyTLSCert]),
 	}
 
 	if err := controllerutil.SetControllerReference(cr, cm, r.Scheme); err != nil {

controllers/argocd/configmap_test.go

@@ -36,9 +36,9 @@ import (
 	"github.com/argoproj-labs/argocd-operator/pkg/argoutil"
 )
 
-var _ reconcile.Reconciler = &ArgoCDReconciler{}
+var _ reconcile.Reconciler = &ReconcileArgoCD{}
 
-func TestArgoCDReconciler_reconcileTLSCerts(t *testing.T) {
+func TestReconcileArgoCD_reconcileTLSCerts(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(initialCerts(t, "root-ca.example.com"))
 
@@ -66,7 +66,7 @@ func TestArgoCDReconciler_reconcileTLSCerts(t *testing.T) {
 	}
 }
 
-func TestArgoCDReconciler_reconcileTLSCerts_configMapUpdate(t *testing.T) {
+func TestReconcileArgoCD_reconcileTLSCerts_configMapUpdate(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(initialCerts(t, "root-ca.example.com"))
 
@@ -109,7 +109,7 @@ func TestArgoCDReconciler_reconcileTLSCerts_configMapUpdate(t *testing.T) {
 	}
 }
 
-func TestArgoCDReconciler_reconcileTLSCerts_withInitialCertsUpdate(t *testing.T) {
+func TestReconcileArgoCD_reconcileTLSCerts_withInitialCertsUpdate(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
 
@@ -142,7 +142,7 @@ func TestArgoCDReconciler_reconcileTLSCerts_withInitialCertsUpdate(t *testing.T)
 	}
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 
 	defaultConfigMapData := map[string]string{
@@ -234,7 +234,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap(t *testing.T) {
 	}
 }
 
-func TestArgoCDReconciler_reconcileEmptyArgoConfigMap(t *testing.T) {
+func TestReconcileArgoCD_reconcileEmptyArgoConfigMap(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
 
@@ -267,7 +267,7 @@ func TestArgoCDReconciler_reconcileEmptyArgoConfigMap(t *testing.T) {
 	assert.NoError(t, err)
 }
 
-func TestArgoCDReconcilerCM_withRepoCredentials(t *testing.T) {
+func TestReconcileArgoCDCM_withRepoCredentials(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
 	a.Spec.RepositoryCredentials = `
@@ -311,7 +311,7 @@ func TestArgoCDReconcilerCM_withRepoCredentials(t *testing.T) {
 	}
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withDisableAdmin(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withDisableAdmin(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(func(a *argoproj.ArgoCD) {
 		a.Spec.DisableAdmin = true
@@ -339,7 +339,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_withDisableAdmin(t *testing.T)
 	}
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withDexConnector(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withDexConnector(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 
 	tests := []struct {
@@ -421,7 +421,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_withDexConnector(t *testing.T)
 
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withDexDisabled(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withDexDisabled(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 
 	tests := []struct {
@@ -472,7 +472,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_withDexDisabled(t *testing.T) {
 }
 
 // When dex is enabled, dexConfig should be present in argocd-cm, when disabled, it should be removed
-func TestArgoCDReconciler_reconcileArgoConfigMap_dexConfigDeletedwhenDexDisabled(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_dexConfigDeletedwhenDexDisabled(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 
 	tests := []struct {
@@ -569,7 +569,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_dexConfigDeletedwhenDexDisabled
 	}
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withKustomizeVersions(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withKustomizeVersions(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(func(a *argoproj.ArgoCD) {
 		kv := argoproj.KustomizeVersionSpec{
@@ -603,7 +603,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_withKustomizeVersions(t *testin
 	}
 }
 
-func TestArgoCDReconciler_reconcileGPGKeysConfigMap(t *testing.T) {
+func TestReconcileArgoCD_reconcileGPGKeysConfigMap(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD(func(a *argoproj.ArgoCD) {
 		a.Spec.DisableAdmin = true
@@ -628,7 +628,7 @@ func TestArgoCDReconciler_reconcileGPGKeysConfigMap(t *testing.T) {
 	// Currently the gpg keys configmap is empty
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withResourceTrackingMethod(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withResourceTrackingMethod(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	a := makeTestArgoCD()
 
@@ -719,7 +719,7 @@ func TestArgoCDReconciler_reconcileArgoConfigMap_withResourceTrackingMethod(t *t
 
 }
 
-func TestArgoCDReconciler_reconcileArgoConfigMap_withResourceInclusions(t *testing.T) {
+func TestReconcileArgoCD_reconcileArgoConfigMap_withResourceInclusions(t *testing.T) {
 	logf.SetLogger(ZapLogger(true))
 	customizations := "testing: testing"
 	updatedCustomizations := "updated-testing: updated-testing"

controllers/argocd/custommapper.go

@@ -19,9 +19,9 @@ func (r *ReconcileArgoCD) clusterResourceMapper(ctx context.Context, o client.Ob
 	namespacedArgoCDObject := client.ObjectKey{}
 
 	for k, v := range crbAnnotations {
-		if k == common.ArgoCDArgoprojKeyName {
+		if k == common.AnnotationName {
 			namespacedArgoCDObject.Name = v
-		} else if k == common.ArgoCDArgoprojKeyNamespace {
+		} else if k == common.AnnotationNamespace {
 			namespacedArgoCDObject.Namespace = v
 		}
 	}
@@ -113,7 +113,7 @@ func (r *ReconcileArgoCD) tlsSecretMapper(ctx context.Context, o client.Object)
 		if !ok {
 			return result
 		}
-		if owner, ok := secret.Annotations[common.ArgoCDArgoprojKeyName]; ok {
+		if owner, ok := secret.Annotations[common.AnnotationName]; ok {
 			namespacedArgoCDObject.Name = owner
 			namespacedArgoCDObject.Namespace = o.GetNamespace()
 			result = []reconcile.Request{

controllers/argocd/custommapper_test.go

@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-func TestArgoCDReconciler_clusterRoleBindingMapper(t *testing.T) {
+func TestReconcileArgoCD_clusterRoleBindingMapper(t *testing.T) {
 
 	type fields struct {
 		client client.Client
@@ -277,7 +277,7 @@ func TestReconcileArgoCD_tlsSecretMapperRepoServer(t *testing.T) {
 				Name:      "argocd-repo-server-tls",
 				Namespace: "argocd-operator",
 				Annotations: map[string]string{
-					common.ArgoCDArgoprojKeyName: "argocd",
+					common.AnnotationName: "argocd",
 				},
 			},
 			Type: corev1.SecretTypeTLS,
@@ -509,7 +509,7 @@ func TestReconcileArgoCD_tlsSecretMapperRedis(t *testing.T) {
 				Name:      "argocd-operator-redis-tls",
 				Namespace: "argocd-operator",
 				Annotations: map[string]string{
-					common.ArgoCDArgoprojKeyName: "argocd",
+					common.AnnotationName: "argocd",
 				},
 			},
 			Type: corev1.SecretTypeTLS,
@@ -569,7 +569,7 @@ func TestReconcileArgoCD_tlsSecretMapperRedis(t *testing.T) {
 
 }
 
-func TestArgoCDReconciler_namespaceResourceMapper(t *testing.T) {
+func TestReconcileArgoCD_namespaceResourceMapper(t *testing.T) {
 	a := makeTestArgoCD()
 
 	resObjs := []client.Object{a}
@@ -598,7 +598,7 @@ func TestArgoCDReconciler_namespaceResourceMapper(t *testing.T) {
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "testNamespace",
 					Labels: map[string]string{
-						common.ArgoCDArgoprojKeyManagedBy: a.Namespace,
+						common.ArgoCDManagedByLabel: a.Namespace,
 					},
 				},
 			},