From 263919a8a8979f5b6c3a25f4c9a81b0da567d8df Mon Sep 17 00:00:00 2001
From: "Seo, Sinhyeok" <44961659+Sinhyeok@users.noreply.github.com>
Date: Mon, 27 Sep 2021 19:04:14 +0900
Subject: [PATCH] fix(argo-cd): Also add hostAliases to dex deployment (#941)

* feat: Add hostAliases to dex/deployment

based on https://github.com/argoproj/argo-helm/pull/274

Signed-off-by: Sinhyeok <sinhyeok@gmail.com>

* Bumped version number of argo-cd chart

Signed-off-by: Sinhyeok <sinhyeok@gmail.com>

* Beautify indentation

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Beautify indentation of existing implementation

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

* Update changelog

Signed-off-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>

Co-authored-by: attar.sh <attar.sh@kakaobank.com>
Co-authored-by: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
---
 charts/argo-cd/Chart.yaml                                   | 4 ++--
 .../templates/argocd-application-controller/deployment.yaml | 6 +++---
 charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 6 +++---
 charts/argo-cd/templates/argocd-server/deployment.yaml      | 6 +++---
 charts/argo-cd/templates/dex/deployment.yaml                | 4 ++++
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 863d64d7..bc547f09 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.0
+version: 3.21.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Ability to provide cluster role to repo-server"
+    - "[Fixed]: Dex deployment now also supports hostAliases"
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 90963613..b924ea41 100755
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -133,10 +133,10 @@ spec:
       {{- end }}
     {{- end }}
       serviceAccountName: {{ template "argo-cd.controllerServiceAccountName" . }}
-{{- with .Values.global.hostAliases }}
+      {{- with .Values.global.hostAliases }}
       hostAliases:
-{{ toYaml . | indent 6 }}
-{{- end }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       volumes:
       - emptyDir: {}
         name: argocd-home
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index eabc1920..7ebb8991 100755
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -141,10 +141,10 @@ spec:
       {{- end }}
     {{- end }}
       serviceAccountName: {{ template "argo-cd.repoServerServiceAccountName" . }}
-{{- with .Values.global.hostAliases }}
+      {{- with .Values.global.hostAliases }}
       hostAliases:
-{{ toYaml . | indent 6 }}
-{{- end }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       volumes:
       {{- if .Values.repoServer.volumes }}
         {{- toYaml .Values.repoServer.volumes | nindent 6 }}
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index c84d9d95..38cd5cbf 100755
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -152,10 +152,10 @@ spec:
       {{- end }}
     {{- end }}
       serviceAccountName: {{ template "argo-cd.serverServiceAccountName" . }}
-{{- with .Values.global.hostAliases }}
+      {{- with .Values.global.hostAliases }}
       hostAliases:
-{{ toYaml . | indent 6 }}
-{{- end }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       volumes:
       {{- if .Values.server.volumes }}
 {{- toYaml .Values.server.volumes | nindent 6}}
diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml
index 5fe78628..17043a95 100755
--- a/charts/argo-cd/templates/dex/deployment.yaml
+++ b/charts/argo-cd/templates/dex/deployment.yaml
@@ -127,6 +127,10 @@ spec:
       {{- end }}
     {{- end }}
       serviceAccountName: {{ template "argo-cd.dexServiceAccountName" . }}
+      {{- with .Values.global.hostAliases }}
+      hostAliases:
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       volumes:
       - emptyDir: {}
         name: tmp-dir