feat(argocd-apps)!: use maps instead of lists (#2538)

* feat(argocd-apps)!: use maps instead of lists Signed-off-by: irizzant <i.rizzante@gmail.com> * fix(chart): add artifacthub annotations Signed-off-by: irizzant <i.rizzante@gmail.com> * fix: remove not needed lines Signed-off-by: irizzant <i.rizzante@gmail.com> * fix: use the right range function Signed-off-by: irizzant <i.rizzante@gmail.com> * fix(argocd-apps): fix issues Signed-off-by: irizzant <i.rizzante@gmail.com> * fix: fix newline issue in values.yaml Signed-off-by: irizzant <i.rizzante@gmail.com> * fix: Use range function properly (revert complex changes on item-templates) Signed-off-by: Marco Maurer <mkilchhofer@users.noreply.github.com> --------- Signed-off-by: irizzant <i.rizzante@gmail.com> Signed-off-by: Marco Maurer <mkilchhofer@users.noreply.github.com> Co-authored-by: Jason Meridth <jmeridth@gmail.com> Co-authored-by: Marco Maurer <mkilchhofer@users.noreply.github.com> Co-authored-by: Aikawa <yu.croco@gmail.com>
2024-03-23 16:38:56 +01:00 · 2024-03-23 16:38:56 +01:00 · 237493a4ab
parent 393402cb1b
commit 237493a4ab
12 changed files with 428 additions and 429 deletions
--- 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: 1.6.2
+version: 2.0.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@ -18,4 +18,4 @@ annotations:
    url: https://argoproj.github.io/argo-helm/pgp_keys.asc
  artifacthub.io/changes: |
    - kind: added
-      description: Support Template Patch to ApplicationSet
+      description: make the chart use maps instead of lists
--- a/charts/argocd-apps/README.md
+++ b/charts/argocd-apps/README.md
@ -28,11 +28,11 @@ $ helm install my-release argo/argocd-apps

 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| applications | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications within this helm release |
-| applicationsets | list | `[]` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release |
-| extensions | list | `[]` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. |
+| applications | object | `{}` (See [values.yaml]) | Deploy Argo CD Applications within this helm release |
+| applicationsets | object | `{}` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release |
+| extensions | object | `{}` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. |
 | itemTemplates | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications/ApplicationSets/Projects within this helm release |
-| projects | list | `[]` (See [values.yaml]) | Deploy Argo CD Projects within this helm release |
+| projects | object | `{}` (See [values.yaml]) | Deploy Argo CD Projects within this helm release |

 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)
--- a/charts/argocd-apps/ci/applications-multiple-sources-values.yaml
+++ b/charts/argocd-apps/ci/applications-multiple-sources-values.yaml
@ -1,28 +1,28 @@
 #  Test with multi-source applications

 applications:
- name: argocd-application-multiple-sources
-  additionalLabels: {}
-  additionalAnnotations: {}
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-  project: default
-  sources:
-  - chart: elasticsearch
-    repoURL: https://helm.elastic.co
-    targetRevision: 8.5.1
-  - repoURL: https://github.com/argoproj/argocd-example-apps.git
-    path: guestbook
-    targetRevision: HEAD
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: false
-      selfHeal: false
-  ignoreDifferences:
-  - group: apps
-    kind: Deployment
-    jsonPointers:
-    - /spec/replicas
+  argocd-application-multiple-sources:
+    additionalLabels: {}
+    additionalAnnotations: {}
+    finalizers:
+    - resources-finalizer.argocd.argoproj.io
+    project: default
+    sources:
+    - chart: elasticsearch
+      repoURL: https://helm.elastic.co
+      targetRevision: 8.5.1
+    - repoURL: https://github.com/argoproj/argocd-example-apps.git
+      path: guestbook
+      targetRevision: HEAD
+    destination:
+      server: https://kubernetes.default.svc
+      namespace: default
+    syncPolicy:
+      automated:
+        prune: false
+        selfHeal: false
+    ignoreDifferences:
+    - group: apps
+      kind: Deployment
+      jsonPointers:
+      - /spec/replicas
--- a/charts/argocd-apps/ci/applications-values.yaml
+++ b/charts/argocd-apps/ci/applications-values.yaml
@ -1,33 +1,33 @@
 #  Test with applications

 applications:
- name: argocd-application
-  additionalLabels: {}
-  additionalAnnotations: {}
-  finalizers:
-  - resources-finalizer.argocd.argoproj.io
-  project: default
-  source:
-    repoURL: https://github.com/argoproj/argocd-example-apps.git
-    targetRevision: HEAD
-    path: guestbook
-    directory:
-      recurse: true
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: default
-  syncPolicy:
-    automated:
-      prune: false
-      selfHeal: false
-    syncOptions:
-      - ApplyOutOfSyncOnly=true
-  revisionHistoryLimit: null
-  ignoreDifferences:
-  - group: apps
-    kind: Deployment
-    jsonPointers:
-    - /spec/replicas
-  info:
-  - name: url
-    value: https://argoproj.github.io/
+  argocd-application:
+    additionalLabels: {}
+    additionalAnnotations: {}
+    finalizers:
+    - resources-finalizer.argocd.argoproj.io
+    project: default
+    source:
+      repoURL: https://github.com/argoproj/argocd-example-apps.git
+      targetRevision: HEAD
+      path: guestbook
+      directory:
+        recurse: true
+    destination:
+      server: https://kubernetes.default.svc
+      namespace: default
+    syncPolicy:
+      automated:
+        prune: false
+        selfHeal: false
+      syncOptions:
+        - ApplyOutOfSyncOnly=true
+    revisionHistoryLimit: null
+    ignoreDifferences:
+    - group: apps
+      kind: Deployment
+      jsonPointers:
+      - /spec/replicas
+    info:
+    - name: url
+      value: https://argoproj.github.io/
--- a/charts/argocd-apps/ci/applicationsets-multiple-sources-values.yaml
+++ b/charts/argocd-apps/ci/applicationsets-multiple-sources-values.yaml
@ -1,24 +1,24 @@
 # Test with multi-source applicationsets

 applicationsets:
- name: applicationset-multiple-sources
-  generators:
-  - list:
-      elements:
-        - cluster: default-cluster
-          url: https://kubernetes.default.svc
-  template:
-    metadata:
-      name: '{{cluster}}-guestbook'
-    spec:
-      project: default
-      sources:
-      - chart: elasticsearch
-        repoURL: https://helm.elastic.co
-        targetRevision: 8.5.1
-      - repoURL: https://github.com/argoproj/argocd-example-apps.git
-        path: guestbook
-        targetRevision: HEAD
-      destination:
-        server: '{{url}}'
-        namespace: default
+  applicationset-multiple-sources:
+    generators:
+    - list:
+        elements:
+          - cluster: default-cluster
+            url: https://kubernetes.default.svc
+    template:
+      metadata:
+        name: '{{cluster}}-guestbook'
+      spec:
+        project: default
+        sources:
+        - chart: elasticsearch
+          repoURL: https://helm.elastic.co
+          targetRevision: 8.5.1
+        - repoURL: https://github.com/argoproj/argocd-example-apps.git
+          path: guestbook
+          targetRevision: HEAD
+        destination:
+          server: '{{url}}'
+          namespace: default
--- a/charts/argocd-apps/ci/applicationsets-progressive-syncs-values.yaml
+++ b/charts/argocd-apps/ci/applicationsets-progressive-syncs-values.yaml
@ -1,41 +1,41 @@
 # Test applicationsets with Progressive Syncs

 applicationsets:
- name: applicationset-progressive-syncs
-  generators:
-  - list:
-      elements:
-      - cluster: engineering-dev
-        url: https://1.2.3.4
-        env: env-dev
-      - cluster: engineering-prod
-        url: https://9.8.7.6/
-        env: env-prod
-  strategy:
-    type: RollingSync
-    rollingSync:
-      steps:
-      - matchExpressions:
-        - key: envLabel
-          operator: In
-          values:
-          - env-dev
-      - matchExpressions:
-        - key: envLabel
-          operator: In
-          values:
-          - env-prod
-  template:
-    metadata:
-      name: '{{.cluster}}-guestbook'
-      labels:
-        envLabel: '{{.env}}'
-    spec:
-      project: my-project
-      source:
-        repoURL: https://github.com/argoproj/argocd-example-apps.git
-        targetRevision: HEAD
-        path: guestbook/{{.cluster}}
-      destination:
-        server: '{{.url}}'
-        namespace: guestbook
+  applicationset-progressive-syncs:
+    generators:
+    - list:
+        elements:
+        - cluster: engineering-dev
+          url: https://1.2.3.4
+          env: env-dev
+        - cluster: engineering-prod
+          url: https://9.8.7.6/
+          env: env-prod
+    strategy:
+      type: RollingSync
+      rollingSync:
+        steps:
+        - matchExpressions:
+          - key: envLabel
+            operator: In
+            values:
+            - env-dev
+        - matchExpressions:
+          - key: envLabel
+            operator: In
+            values:
+            - env-prod
+    template:
+      metadata:
+        name: '{{.cluster}}-guestbook'
+        labels:
+          envLabel: '{{.env}}'
+      spec:
+        project: my-project
+        source:
+          repoURL: https://github.com/argoproj/argocd-example-apps.git
+          targetRevision: HEAD
+          path: guestbook/{{.cluster}}
+        destination:
+          server: '{{.url}}'
+          namespace: guestbook
--- a/charts/argocd-apps/ci/applicationsets-values.yaml
+++ b/charts/argocd-apps/ci/applicationsets-values.yaml
@ -1,90 +1,90 @@
 # Test with applicationsets

 applicationsets:
- name: applicationset
-  additionalLabels: {}
-  additionalAnnotations: {}
-  # See PR #10026 (ArgoCD v2.5 or later)
-  # goTemplate: false
-  generators:
-  - git:
-      repoURL: https://github.com/argoproj/argocd-example-apps.git
-      revision: HEAD
-      directories:
-      - path: guestbook
-      - path: kustomize-*
-  # Ref https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-  ignoreApplicationDifferences:
-  - jsonPointers:
-    - /spec/syncPolicy
-  template:
-    metadata:
-      name: '{{path.basename}}'
-      labels: {}
-      annotations: {}
-    spec:
-      project: default
-      source:
+  applicationset:
+    additionalLabels: {}
+    additionalAnnotations: {}
+    # See PR #10026 (ArgoCD v2.5 or later)
+    # goTemplate: false
+    generators:
+    - git:
        repoURL: https://github.com/argoproj/argocd-example-apps.git
-        targetRevision: HEAD
-        path: '{{path}}'
-      destination:
-        server: https://kubernetes.default.svc
-        namespace: default
-      syncPolicy:
-        automated:
-          prune: false
-          selfHeal: false
-      ignoreDifferences:
-      - group: apps
-        kind: Deployment
-        jsonPointers:
-        - /spec/replicas
-      info:
-      - name: url
-        value: https://argoproj.github.io/
-  syncPolicy:
-    # Set Application finalizer
-    preserveResourcesOnDeletion: false
-  templatePatch: |
-    spec:
-      source:
-        helm:
-          valueFiles:
-          {{- range $valueFile := .valueFiles }}
-            - {{ $valueFile }}
-          {{- end }}
-    {{- if .autoSync }}
-      syncPolicy:
-        automated:
-          prune: {{ .prune }}
-    {{- end }}
- 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
+        revision: HEAD
+        directories:
+        - path: guestbook
+        - path: kustomize-*
+    # Ref https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
+    ignoreApplicationDifferences:
+    - jsonPointers:
+      - /spec/syncPolicy
+    template:
+      metadata:
+        name: '{{path.basename}}'
+        labels: {}
+        annotations: {}
+      spec:
+        project: default
+        source:
+          repoURL: https://github.com/argoproj/argocd-example-apps.git
+          targetRevision: HEAD
+          path: '{{path}}'
+        destination:
+          server: https://kubernetes.default.svc
+          namespace: default
+        syncPolicy:
+          automated:
+            prune: false
+            selfHeal: false
+        ignoreDifferences:
+        - group: apps
+          kind: Deployment
+          jsonPointers:
+          - /spec/replicas
+        info:
+        - name: url
+          value: https://argoproj.github.io/
+    syncPolicy:
+      # Set Application finalizer
+      preserveResourcesOnDeletion: false
+    templatePatch: |
+      spec:
+        source:
+          helm:
+            valueFiles:
+            {{- range $valueFile := .valueFiles }}
+              - {{ $valueFile }}
+            {{- end }}
+      {{- if .autoSync }}
+        syncPolicy:
+          automated:
+            prune: {{ .prune }}
+      {{- end }}
+  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
--- a/charts/argocd-apps/templates/applications.yaml
+++ b/charts/argocd-apps/templates/applications.yaml
@ -1,50 +1,50 @@
-{{- range .Values.applications }}
+{{- range $appName, $appData:= .Values.applications }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $appData.additionalAnnotations }}
  annotations:
    {{- range $key, $value := . }}
    {{ $key }}: {{ $value | quote }}
    {{- end }}
  {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $appData.additionalLabels }}
  labels:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  name: {{ .name }}
-  {{- with .namespace }}
+  name: {{ $appName }}
+  {{- with $appData.namespace }}
  namespace: {{ . }}
  {{- end }}
-  {{- with .finalizers }}
+  {{- with $appData.finalizers }}
  finalizers:
    {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
-  project: {{ tpl .project $ }}
-  {{- with .source }}
+  project: {{ tpl $appData.project $ }}
+  {{- with $appData.source }}
  source:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .sources }}
+  {{- with $appData.sources }}
  sources:
    {{- toYaml . | nindent 4 }}
  {{- end }}
  destination:
-    {{- toYaml .destination | nindent 4 }}
-  {{- with .syncPolicy }}
+    {{- toYaml $appData.destination | nindent 4 }}
+  {{- with $appData.syncPolicy }}
  syncPolicy:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .revisionHistoryLimit }}
+  {{- with $appData.revisionHistoryLimit }}
  revisionHistoryLimit: {{ . }}
  {{- end }}
-  {{- with .ignoreDifferences }}
+  {{- with $appData.ignoreDifferences }}
  ignoreDifferences:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .info }}
+  {{- with $appData.info }}
  info:
    {{- toYaml . | nindent 4 }}
  {{- end }}
--- a/charts/argocd-apps/templates/applicationsets.yaml
+++ b/charts/argocd-apps/templates/applicationsets.yaml
@ -1,44 +1,43 @@
-
-{{- range .Values.applicationsets }}
+{{- range $appSetName, $appSetData:= .Values.applicationsets }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $appSetData.additionalAnnotations }}
  annotations:
    {{- range $key, $value := . }}
    {{ $key }}: {{ $value | quote }}
    {{- end }}
  {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $appSetData.additionalLabels }}
  labels:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  name: {{ .name }}
-  {{- with .namespace }}
+  name: {{ $appSetName }}
+  {{- with $appSetData.namespace }}
  namespace: {{ . }}
  {{- end }}
 spec:
-  {{- if hasKey . "goTemplate" }}
-  goTemplate: {{ .goTemplate }}
+  {{- if hasKey $appSetData "goTemplate" }}
+  goTemplate: {{ $appSetData.goTemplate }}
  {{- end }}
-  {{- with .generators }}
+  {{- with $appSetData.generators }}
  generators:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .ignoreApplicationDifferences }}
+  {{- with $appSetData.ignoreApplicationDifferences }}
  ignoreApplicationDifferences:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .strategy }}
+  {{- with $appSetData.strategy }}
  strategy:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .syncPolicy }}
+  {{- with $appSetData.syncPolicy }}
  syncPolicy:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .template }}
+  {{- with $appSetData.template }}
  template:
    {{- with .metadata }}
    metadata:
@ -84,7 +83,7 @@ spec:
      {{- end }}
    {{- end -}}
  {{- end }}
-  {{- with .templatePatch }}
+  {{- with $appSetData.templatePatch }}
  templatePatch: |
    {{- . | nindent 4 }}
  {{- end }}
--- a/charts/argocd-apps/templates/extensions.yaml
+++ b/charts/argocd-apps/templates/extensions.yaml
@ -1,25 +1,25 @@
-{{- range .Values.extensions }}
+{{- range $extensionName, $extensionData:= .Values.extensions }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: ArgoCDExtension
 metadata:
-  name: {{ .name }}
-  {{- with .namespace }}
+  name: {{ $extensionName }}
+  {{- with $extensionData.namespace }}
  namespace: {{ . }}
  {{- end }}
  finalizers:
    - extensions-finalizer.argocd.argoproj.io
-  {{- with .additionalLabels }}
+  {{- with $extensionData.additionalLabels }}
  labels:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .additionalAnnotations }}
+  {{- with $extensionData.additionalAnnotations }}
  annotations:
    {{- range $key, $value := . }}
    {{ $key }}: {{ $value | quote }}
    {{- end }}
  {{- end }}
-{{- with .sources }}
+{{- with $extensionData.sources }}
 spec:
  sources:
    {{- toYaml . | nindent 4 }}
--- a/charts/argocd-apps/templates/projects.yaml
+++ b/charts/argocd-apps/templates/projects.yaml
@ -1,72 +1,72 @@
-{{- range .Values.projects }}
+{{- range $projectName, $projectData := .Values.projects }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $projectData.additionalAnnotations }}
  annotations:
    {{- range $key, $value := . }}
    {{ $key }}: {{ $value | quote }}
    {{- end }}
  {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $projectData.additionalLabels }}
  labels:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  name: {{ .name }}
-  {{- with .namespace }}
+  name: {{ $projectName }}
+  {{- with $projectData.namespace }}
  namespace: {{ . }}
  {{- end }}
-  {{- with .finalizers }}
+  {{- with $projectData.finalizers }}
  finalizers:
    {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
-  {{- with .permitOnlyProjectScopedClusters }}
+  {{- with $projectData.permitOnlyProjectScopedClusters }}
  permitOnlyProjectScopedClusters: {{ . }}
  {{- end }}
-  description: {{ .description }}
-  {{- with .sourceRepos }}
+  description: {{ $projectData.description }}
+  {{- with $projectData.sourceRepos }}
  sourceRepos:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .destinations }}
+  {{- with $projectData.destinations }}
  destinations:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .clusterResourceWhitelist }}
+  {{- with $projectData.clusterResourceWhitelist }}
  clusterResourceWhitelist:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .clusterResourceBlacklist }}
+  {{- with $projectData.clusterResourceBlacklist }}
  clusterResourceBlacklist:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .namespaceResourceBlacklist }}
+  {{- with $projectData.namespaceResourceBlacklist }}
  namespaceResourceBlacklist:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .namespaceResourceWhitelist }}
+  {{- with $projectData.namespaceResourceWhitelist }}
  namespaceResourceWhitelist:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .orphanedResources }}
+  {{- with $projectData.orphanedResources }}
  orphanedResources:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .roles }}
+  {{- with $projectData.roles }}
  roles:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .syncWindows }}
+  {{- with $projectData.syncWindows }}
  syncWindows:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .signatureKeys }}
+  {{- with $projectData.signatureKeys }}
  signatureKeys:
    {{- toYaml . | nindent 4 }}
  {{- end }}
-  {{- with .sourceNamespaces }}
+  {{- with $projectData.sourceNamespaces }}
  sourceNamespaces:
    {{- toYaml . | nindent 4 }}
  {{- end }}
--- a/charts/argocd-apps/values.yaml
+++ b/charts/argocd-apps/values.yaml
@ -1,176 +1,176 @@
 # -- Deploy Argo CD Applications within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
-applications: []
-# - name: guestbook
-#   namespace: argocd
-#   additionalLabels: {}
-#   additionalAnnotations: {}
-#   finalizers:
-#   - resources-finalizer.argocd.argoproj.io
-#   project: guestbook
-#   source:
-#     repoURL: https://github.com/argoproj/argocd-example-apps.git
-#     targetRevision: HEAD
-#     path: guestbook
-#     directory:
-#       recurse: true
-#   # ArgoCD v2.6 or later
-#   sources:
+applications: {}
+#  guestbook:
+#    namespace: argocd
+#    additionalLabels: {}
+#    additionalAnnotations: {}
+#    finalizers:
+#    - resources-finalizer.argocd.argoproj.io
+#    project: guestbook
+#    source:
+#      repoURL: https://github.com/argoproj/argocd-example-apps.git
+#      targetRevision: HEAD
+#      path: guestbook
+#      directory:
+#        recurse: true
+#    # ArgoCD v2.6 or later
+#    sources:
 #    - chart: elasticsearch
 #      repoURL: https://helm.elastic.co
 #      targetRevision: 8.5.1
 #    - repoURL: https://github.com/argoproj/argocd-example-apps.git
 #      path: guestbook
 #      targetRevision: HEAD
-#   destination:
-#     server: https://kubernetes.default.svc
-#     namespace: guestbook
-#   syncPolicy:
-#     automated:
-#       prune: false
-#       selfHeal: false
-#     syncOptions:
-#     - CreateNamespace=true
-#   revisionHistoryLimit: null
-#   ignoreDifferences:
-#   - group: apps
-#     kind: Deployment
-#     jsonPointers:
-#     - /spec/replicas
-#   info:
-#   - name: url
-#     value: https://argoproj.github.io/
+#    destination:
+#      server: https://kubernetes.default.svc
+#      namespace: guestbook
+#    syncPolicy:
+#      automated:
+#        prune: false
+#        selfHeal: false
+#      syncOptions:
+#      - CreateNamespace=true
+#    revisionHistoryLimit: null
+#    ignoreDifferences:
+#    - group: apps
+#      kind: Deployment
+#      jsonPointers:
+#      - /spec/replicas
+#    info:
+#    - name: url
+#      value: https://argoproj.github.io/

 # -- Deploy Argo CD Projects within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
-projects: []
-# - name: guestbook
-#   namespace: argocd
-#   additionalLabels: {}
-#   additionalAnnotations: {}
-#   permitOnlyProjectScopedClusters: false
-#   finalizers:
-#   - resources-finalizer.argocd.argoproj.io
-#   description: Example Project
-#   sourceRepos:
-#   - '*'
-#   destinations:
-#   - namespace: guestbook
-#     server: https://kubernetes.default.svc
-#   clusterResourceWhitelist: []
-#   clusterResourceBlacklist: []
-#   namespaceResourceBlacklist:
-#   - group: ''
-#     kind: ResourceQuota
-#   - group: ''
-#     kind: LimitRange
-#   - group: ''
-#     kind: NetworkPolicy
-#     orphanedResources: {}
-#     roles: []
-#   namespaceResourceWhitelist:
-#   - group: 'apps'
-#     kind: Deployment
-#   - group: 'apps'
-#     kind: StatefulSet
-#   orphanedResources: {}
-#   roles: []
-#   syncWindows:
-#   - kind: allow
-#     schedule: '10 1 * * *'
-#     duration: 1h
-#     applications:
-#     - '*-prod'
-#     manualSync: true
-#   signatureKeys:
-#   - keyID: ABCDEF1234567890
-#   sourceNamespaces:
-#   - argocd
+projects: {}
+#  guestbook:
+#    namespace: argocd
+#    additionalLabels: {}
+#    additionalAnnotations: {}
+#    permitOnlyProjectScopedClusters: false
+#    finalizers:
+#    - resources-finalizer.argocd.argoproj.io
+#    description: Example Project
+#    sourceRepos:
+#    - '*'
+#    destinations:
+#    - namespace: guestbook
+#      server: https://kubernetes.default.svc
+#    clusterResourceWhitelist: []
+#    clusterResourceBlacklist: []
+#    namespaceResourceBlacklist:
+#    - group: ''
+#      kind: ResourceQuota
+#    - group: ''
+#      kind: LimitRange
+#    - group: ''
+#      kind: NetworkPolicy
+#      orphanedResources: {}
+#      roles: []
+#    namespaceResourceWhitelist:
+#    - group: 'apps'
+#      kind: Deployment
+#    - group: 'apps'
+#      kind: StatefulSet
+#    orphanedResources: {}
+#    roles: []
+#    syncWindows:
+#    - kind: allow
+#      schedule: '10 1 * * *'
+#      duration: 1h
+#      applications:
+#      - '*-prod'
+#      manualSync: true
+#    signatureKeys:
+#    - keyID: ABCDEF1234567890
+#    sourceNamespaces:
+#    - argocd

 # -- Deploy Argo CD ApplicationSets within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/
-applicationsets: []
-# - name: guestbook
-#   namespace: argocd
-#   additionalLabels: {}
-#   additionalAnnotations: {}
-#   # See PR #10026 (ArgoCD v2.5 or later)
-#   # goTemplate: false
-#   generators:
-#   - git:
-#       repoURL: https://github.com/argoproj/argocd-example-apps.git
-#       revision: HEAD
-#       directories:
-#       - path: guestbook
-#       - path: kustomize-*
-#   # Ref https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
-#   ignoreApplicationDifferences:
-#   - jsonPointers:
-#     - /spec/syncPolicy
-#   # Progressive Syncs is an experimental feature and it must be explicitly enabled
-#   # Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Progressive-Syncs/#enabling-progressive-syncs
-#   strategy:
-#     type: RollingSync
-#     rollingSync:
-#       steps:
-#       - matchExpressions:
-#         - key: project
-#           operator: In
-#           values:
-#           - guestbook
-#       - matchExpressions:
-#         - key: project
-#           operator: In
-#           values:
-#           - kustomize-foo
-#           - kustomize-bar
-#   template:
-#     metadata:
-#       name: '{{path.basename}}'
-#       labels:
-#         project: '{{path.basename}}'
-#       annotations: {}
-#     spec:
-#       project: default
-#       source:
-#         repoURL: https://github.com/argoproj/argocd-example-apps.git
-#         targetRevision: HEAD
-#         path: '{{path}}'
-#       destination:
-#         server: https://kubernetes.default.svc
-#         namespace: default
-#       syncPolicy:
-#         automated:
-#           prune: false
-#           selfHeal: false
-#       ignoreDifferences:
-#       - group: apps
-#         kind: Deployment
-#         jsonPointers:
-#         - /spec/replicas
-#       info:
-#       - name: url
-#         value: https://argoproj.github.io/
-#   syncPolicy:
-#     # Set Application finalizer
-#     preserveResourcesOnDeletion: false
-#   # Templating is only available on string type
-#   templatePatch: |
-#     spec:
-#       source:
-#         helm:
-#           valueFiles:
-#           {{- range $valueFile := .valueFiles }}
-#             - {{ $valueFile }}
-#           {{- end }}
-#     {{- if .autoSync }}
-#       syncPolicy:
-#         automated:
-#           prune: {{ .prune }}
-#     {{- end }}
+applicationsets: {}
+#  guestbook:
+#    namespace: argocd
+#    additionalLabels: {}
+#    additionalAnnotations: {}
+#    # See PR #10026 (ArgoCD v2.5 or later)
+#    # goTemplate: false
+#    generators:
+#    - git:
+#        repoURL: https://github.com/argoproj/argocd-example-apps.git
+#        revision: HEAD
+#        directories:
+#        - path: guestbook
+#        - path: kustomize-*
+#    # Ref https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Controlling-Resource-Modification/#allow-temporarily-toggling-auto-sync
+#    ignoreApplicationDifferences:
+#    - jsonPointers:
+#      - /spec/syncPolicy
+#    # Progressive Syncs is an experimental feature and it must be explicitly enabled
+#    # Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/Progressive-Syncs/#enabling-progressive-syncs
+#    strategy:
+#      type: RollingSync
+#      rollingSync:
+#        steps:
+#        - matchExpressions:
+#          - key: project
+#            operator: In
+#            values:
+#            - guestbook
+#        - matchExpressions:
+#          - key: project
+#            operator: In
+#            values:
+#            - kustomize-foo
+#            - kustomize-bar
+#    template:
+#      metadata:
+#        name: '{{path.basename}}'
+#        labels:
+#          project: '{{path.basename}}'
+#        annotations: {}
+#      spec:
+#        project: default
+#        source:
+#          repoURL: https://github.com/argoproj/argocd-example-apps.git
+#          targetRevision: HEAD
+#          path: '{{path}}'
+#        destination:
+#          server: https://kubernetes.default.svc
+#          namespace: default
+#        syncPolicy:
+#          automated:
+#            prune: false
+#            selfHeal: false
+#        ignoreDifferences:
+#        - group: apps
+#          kind: Deployment
+#          jsonPointers:
+#          - /spec/replicas
+#        info:
+#        - name: url
+#          value: https://argoproj.github.io/
+#    syncPolicy:
+#      # Set Application finalizer
+#      preserveResourcesOnDeletion: false
+#    # Templating is only available on string type
+#    templatePatch: |
+#      spec:
+#        source:
+#          helm:
+#            valueFiles:
+#            {{- range $valueFile := .valueFiles }}
+#              - {{ $valueFile }}
+#            {{- end }}
+#      {{- if .autoSync }}
+#        syncPolicy:
+#          automated:
+#            prune: {{ .prune }}
+#      {{- end }}

 # --  Deploy Argo CD Applications/ApplicationSets/Projects within this helm release
 # @default -- `[]` (See [values.yaml])
@ -238,16 +238,16 @@ itemTemplates: []
 #             namespace: guestbook

 # -- DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info.
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## This function in tech preview stage, do expect unstability or breaking changes in newer versions. Bump image.tag if necessary.
 ## Ref: https://github.com/argoproj-labs/argocd-extensions
-extensions: []
-  # - name: example
-  #   namespace: argocd
-  #   additionalLabels: {}
-  #   additionalAnnotations: {}
-  #   sources:
-  #     - git:
-  #         url: https://github.com/argoproj-labs/argocd-example-extension.git
-  #     - web:
-  #         url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar
+extensions: {}
+#  example:
+#    namespace: argocd
+#    additionalLabels: {}
+#    additionalAnnotations: {}
+#    sources:
+#      - git:
+#          url: https://github.com/argoproj-labs/argocd-example-extension.git
+#      - web:
+#          url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar