From 086310f23701dff84067a077b987a779ec6cd5b1 Mon Sep 17 00:00:00 2001
From: toyamagu <83329336+toyamagu-2021@users.noreply.github.com>
Date: Thu, 27 Apr 2023 21:49:02 +0900
Subject: [PATCH] fix(argocd-apps): Changed the project field of the
 applicationset from a tpl to str(#1978) (#1979)

fix: Changed the project field of the applicationset from a tpl function to a string.

Signed-off-by: tomoki-yamaguchi <toyamagu2021@gmail.com>
---
 charts/argocd-apps/Chart.yaml                 |  6 ++--
 .../ci/applicationsets-values.yaml            | 29 +++++++++++++++++++
 .../templates/applicationsets.yaml            |  2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/charts/argocd-apps/Chart.yaml b/charts/argocd-apps/Chart.yaml
index 2f7a6d5c..c8e37b3b 100644
--- a/charts/argocd-apps/Chart.yaml
+++ b/charts/argocd-apps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: A Helm chart for managing additional Argo CD Applications and Projects
 type: application
-version: 0.0.9
+version: 1.0.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -14,5 +14,5 @@ maintainers:
     url: https://argoproj.github.io/
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: Multiple sources for Application and ApplicationSet
+    - kind: fixed
+      description: Changed the project field of the applicationset from a tpl function to a string.
diff --git a/charts/argocd-apps/ci/applicationsets-values.yaml b/charts/argocd-apps/ci/applicationsets-values.yaml
index 2258f422..6142b1bb 100644
--- a/charts/argocd-apps/ci/applicationsets-values.yaml
+++ b/charts/argocd-apps/ci/applicationsets-values.yaml
@@ -42,3 +42,32 @@ applicationsets:
   syncPolicy:
     # Set Application finalizer
     preserveResourcesOnDeletion: false
+- name: applicationset-list-generator
+  generators:
+  - list:
+      elements:
+        - cluster: engineering-dev
+          url: https://kubernetes.default.svc
+      template:
+        metadata: {}
+        spec:
+          project: '{{cluster}}'
+          source:
+            targetRevision: HEAD
+            repoURL: https://github.com/argoproj/argo-cd.git
+            # New path value is generated here:
+            path: 'applicationset/examples/template-override/{{cluster}}-override'
+          destination: {}
+  template:
+    metadata:
+      name: '{{cluster}}-guestbook'
+    spec:
+      project: '{{cluster}}'
+      source:
+        repoURL: https://github.com/argoproj/argo-cd.git
+        targetRevision: HEAD
+        # This 'default' value is not used: it is is replaced by the generator's template path, above
+        path: applicationset/examples/template-override/default
+      destination:
+        server: '{{url}}'
+        namespace: guestbook
diff --git a/charts/argocd-apps/templates/applicationsets.yaml b/charts/argocd-apps/templates/applicationsets.yaml
index aa7a3b79..bb8b09d1 100644
--- a/charts/argocd-apps/templates/applicationsets.yaml
+++ b/charts/argocd-apps/templates/applicationsets.yaml
@@ -51,7 +51,7 @@ spec:
     {{- end }}
     {{- with .spec }}
     spec:
-      project: {{ tpl .project $ }}
+      project: {{ .project | squote }}
       {{- with .source }}
       source:
         {{- toYaml . | nindent 8 }}