Merge branch 'master' of github.com:argoproj-labs/argocd-operator int…

…o operator-redesign
jaideepr97 · Oct 10, 2023 · effb0dd · effb0dd
2 parents e7362b5 + 64aa268
commit effb0dd
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/controllers/argocd/configmap.go b/controllers/argocd/configmap.go
@@ -158,7 +158,10 @@ func getResourceHealthChecks(cr *argoproj.ArgoCD) map[string]string {
 	if cr.Spec.ResourceHealthChecks != nil {
 		resourceHealthChecks := cr.Spec.ResourceHealthChecks
 		for _, healthCustomization := range resourceHealthChecks {
-			subkey := "resource.customizations.health." + healthCustomization.Group + "_" + healthCustomization.Kind
+			if healthCustomization.Group != "" {
+				healthCustomization.Group += "_"
+			}
+			subkey := "resource.customizations.health." + healthCustomization.Group + healthCustomization.Kind
 			subvalue := healthCustomization.Check
 			healthCheck[subkey] = subvalue
 		}
@@ -181,7 +184,10 @@ func getResourceIgnoreDifferences(cr *argoproj.ArgoCD) (map[string]string, error
 			ignoreDiff[subkey] = subvalue
 		}
 		for _, ignoreDiffCustomization := range resourceIgnoreDiff.ResourceIdentifiers {
-			subkey := "resource.customizations.ignoreDifferences." + ignoreDiffCustomization.Group + "_" + ignoreDiffCustomization.Kind
+			if ignoreDiffCustomization.Group != "" {
+				ignoreDiffCustomization.Group += "_"
+			}
+			subkey := "resource.customizations.ignoreDifferences." + ignoreDiffCustomization.Group + ignoreDiffCustomization.Kind
 			bytes, err := yaml.Marshal(ignoreDiffCustomization.Customization)
 			if err != nil {
 				return ignoreDiff, err
@@ -199,7 +205,10 @@ func getResourceActions(cr *argoproj.ArgoCD) map[string]string {
 	if cr.Spec.ResourceActions != nil {
 		resourceAction := cr.Spec.ResourceActions
 		for _, actionCustomization := range resourceAction {
-			subkey := "resource.customizations.actions." + actionCustomization.Group + "_" + actionCustomization.Kind
+			if actionCustomization.Group != "" {
+				actionCustomization.Group += "_"
+			}
+			subkey := "resource.customizations.actions." + actionCustomization.Group + actionCustomization.Kind
 			subvalue := actionCustomization.Action
 			action[subkey] = subvalue
 		}

diff --git a/controllers/argocd/configmap_test.go b/controllers/argocd/configmap_test.go
@@ -705,6 +705,11 @@ managedfieldsmanagers:
 			Kind:  "healthBar",
 			Check: "healthBar",
 		},
+		{
+			Group: "",
+			Kind:  "healthFooBar",
+			Check: "healthFooBar",
+		},
 	}
 	actions := []argoproj.ResourceAction{
 		{
@@ -717,6 +722,11 @@ managedfieldsmanagers:
 			Kind:   "actionsBar",
 			Action: "actionsBar",
 		},
+		{
+			Group:  "",
+			Kind:   "actionsFooBar",
+			Action: "actionsFooBar",
+		},
 	}
 	ignoreDifferences := argoproj.ResourceIgnoreDifference{
 		All: &argoproj.IgnoreDifferenceCustomization{
@@ -734,6 +744,15 @@ managedfieldsmanagers:
 					ManagedFieldsManagers: []string{"a", "b"},
 				},
 			},
+			{
+				Group: "",
+				Kind:  "ignoreDiffFoo",
+				Customization: argoproj.IgnoreDifferenceCustomization{
+					JqPathExpressions:     []string{"a", "b"},
+					JsonPointers:          []string{"a", "b"},
+					ManagedFieldsManagers: []string{"a", "b"},
+				},
+			},
 		},
 	}
 
@@ -757,10 +776,13 @@ managedfieldsmanagers:
 	desiredCM := make(map[string]string)
 	desiredCM["resource.customizations.health.healthFoo_healthFoo"] = "healthFoo"
 	desiredCM["resource.customizations.health.healthBar_healthBar"] = "healthBar"
+	desiredCM["resource.customizations.health.healthFooBar"] = "healthFooBar"
 	desiredCM["resource.customizations.actions.actionsFoo_actionsFoo"] = "actionsFoo"
 	desiredCM["resource.customizations.actions.actionsBar_actionsBar"] = "actionsBar"
+	desiredCM["resource.customizations.actions.actionsFooBar"] = "actionsFooBar"
 	desiredCM["resource.customizations.ignoreDifferences.all"] = desiredIgnoreDifferenceCustomization
 	desiredCM["resource.customizations.ignoreDifferences.ignoreDiffBar_ignoreDiffBar"] = desiredIgnoreDifferenceCustomization
+	desiredCM["resource.customizations.ignoreDifferences.ignoreDiffFoo"] = desiredIgnoreDifferenceCustomization
 
 	for k, v := range desiredCM {
 		if value, ok := cm.Data[k]; !ok || value != v {