ensure multi source spec is handled

pkg/controllers/custompackage/controller.go

@@ -86,7 +86,7 @@ func (r *Reconciler) reconcileCustomPackage(ctx context.Context, resource *v1alp
 		synced := true
 		if app.Spec.HasMultipleSources() {
 			for j := range app.Spec.Sources {
-				s := app.Spec.Sources[j]
+				s := &app.Spec.Sources[j]
 				res, repo, sErr := r.reconcileArgocdSource(ctx, resource, appName, resource.Spec.ArgoCD.ApplicationFile, s.RepoURL)
 				if sErr != nil {
 					return res, sErr
@@ -190,8 +190,13 @@ func (r *Reconciler) reconcileGitRepo(ctx context.Context, resource *v1alpha1.Cu
 		}
 		return nil
 	})
+	// it's possible for an application to specify the same directory multiple times in the spec.
+	// if there is a repository already created for this package, no further action is necessary.
+	if !errors.IsAlreadyExists(err) {
+		return repo, err
+	}
 
-	return repo, err
+	return repo, nil
 }
 
 func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {

pkg/controllers/custompackage/controller_test.go

@@ -111,6 +111,23 @@ func TestReconcileCustomPkg(t *testing.T) {
 				},
 			},
 		},
+		{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "test3",
+				Namespace: "test",
+				UID:       "abc",
+			},
+			Spec: v1alpha1.CustomPackageSpec{
+				Replicate:           true,
+				GitServerURL:        "https://cnoe.io",
+				InternalGitServeURL: "http://internal.cnoe.io",
+				ArgoCD: v1alpha1.ArgoCDPackageSpec{
+					ApplicationFile: filepath.Join(cwd, "test/resources/customPackages/testDir/app2.yaml"),
+					Name:            "my-app2",
+					Namespace:       "argocd",
+				},
+			},
+		},
 	}
 
 	for _, n := range []string{"argocd", "test"} {
@@ -182,4 +199,19 @@ func TestReconcileCustomPkg(t *testing.T) {
 			t.Fatalf("expected %s arogapp : %v", n, err)
 		}
 	}
+
+	localApp2 := argov1alpha1.Application{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-app2",
+			Namespace: "argocd",
+		},
+	}
+	err = c.Get(context.Background(), client.ObjectKeyFromObject(&localApp2), &localApp2)
+	if err != nil {
+		t.Fatalf("failed getting my-app2 %v", err)
+	}
+
+	if strings.HasPrefix(localApp2.Spec.Sources[0].RepoURL, "cnoe://") {
+		t.Fatalf("cnoe:// prefix should be removed")
+	}
 }

pkg/controllers/custompackage/test/resources/customPackages/testDir/app2.yaml

@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: my-app2
+  namespace: argocd
+spec:
+  destination:
+    namespace: my-app2
+    server: "https://kubernetes.default.svc"
+  sources:
+    - repoURL: cnoe://app2
+      targetRevision: HEAD
+      path: "one"
+    - repoURL: cnoe://app2
+      targetRevision: HEAD
+      path: "two"
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true

pkg/controllers/custompackage/test/resources/customPackages/testDir/app2/one/busybox.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: busybox
+  namespace: argocd
+  labels:
+    abc: ded
+    notused: remove-me
+spec:
+  containers:
+    - image: alpine:3.18
+      command:
+        - sleep
+        - "3600"
+      imagePullPolicy: IfNotPresent
+      name: busybox
+  restartPolicy: Always

pkg/controllers/custompackage/test/resources/customPackages/testDir/app2/two/busybox.yaml

@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: busybox
+  namespace: argocd
+  labels:
+    abc: ded
+    notused: remove-me
+spec:
+  containers:
+    - image: alpine:3.18
+      command:
+        - sleep
+        - "3600"
+      imagePullPolicy: IfNotPresent
+      name: busybox
+  restartPolicy: Always