From f881d66379f42d96ee2a48293cf7b1ae26942626 Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Mon, 27 Sep 2021 20:56:09 +0200
Subject: [PATCH] Apply changes from code review

Changes in detail:
- Add missing examples/documentation in values.yaml
- Beautify indentation
- Use 'with' instead of 'if' to don't repeat variable names
- Fix changelog annotation
- Bump minor chart version as this adds a feature

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-cd/Chart.yaml                     |  5 +--
 .../templates/argocd-server/applications.yaml | 40 +++++++++----------
 charts/argo-cd/values.yaml                    | 18 ++++++---
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 1286410b..4e7c318f 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.2
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.21.2
+version: 3.22.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,5 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Dex deployment now also supports hostAliases"
-    - "[Fixed]: server.additionalApplications.[].info"
+    - "[Added]: Support for server.additionalApplications[].info"
diff --git a/charts/argo-cd/templates/argocd-server/applications.yaml b/charts/argo-cd/templates/argocd-server/applications.yaml
index a1394b1a..d4d6171b 100644
--- a/charts/argo-cd/templates/argocd-server/applications.yaml
+++ b/charts/argo-cd/templates/argocd-server/applications.yaml
@@ -2,45 +2,45 @@
 apiVersion: v1
 kind: List
 items:
-{{- range .Values.server.additionalApplications }}
+  {{- range .Values.server.additionalApplications }}
   - apiVersion: argoproj.io/v1alpha1
     kind: Application
     metadata:
-      {{- if .additionalAnnotations }}
+      {{- with .additionalAnnotations }}
       annotations:
-      {{- range $key, $value := .additionalAnnotations }}
+        {{- range $key, $value := . }}
         {{ $key }}: {{ $value | quote }}
+        {{- end }}
       {{- end }}
-      {{- end }}
-      {{- if .additionalLabels }}
+      {{- with .additionalLabels }}
       labels:
-{{- toYaml .additionalLabels | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       name: {{ .name }}
-      {{- if .namespace }}
-      namespace: {{ .namespace }}
+      {{- with .namespace }}
+      namespace: {{ . }}
       {{- end }}
-      {{- if .finalizers }}
+      {{- with .finalizers }}
       finalizers:
-{{- toYaml .finalizers | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
     spec:
       project: {{ tpl .project $ }}
       source:
-{{- toYaml .source | nindent 8 }}
+        {{- toYaml .source | nindent 8 }}
       destination:
-{{- toYaml .destination | nindent 8 }}
-      {{- if .syncPolicy }}
+        {{- toYaml .destination | nindent 8 }}
+      {{- with .syncPolicy }}
       syncPolicy:
-{{- toYaml .syncPolicy | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .ignoreDifferences }}
+      {{- with .ignoreDifferences }}
       ignoreDifferences:
-{{- toYaml .ignoreDifferences | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .info }}
+      {{- with .info }}
       info:
-{{- toYaml .info | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
-{{- end }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 17d95a80..d914eacf 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -847,13 +847,21 @@ server:
   #     path: guestbook
   #     directory:
   #       recurse: true
-  #  destination:
+  #   destination:
   #     server: https://kubernetes.default.svc
   #     namespace: guestbook
-  #  syncPolicy:
-  #    automated:
-  #      prune: false
-  #      selfHeal: false
+  #   syncPolicy:
+  #     automated:
+  #       prune: false
+  #       selfHeal: false
+  #   ignoreDifferences:
+  #   - group: apps
+  #     kind: Deployment
+  #     jsonPointers:
+  #     - /spec/replicas
+  #   info:
+  #   - name: url
+  #     value: https://argoproj.github.io/
 
   ## Projects
   ## reference: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/