From b9af202660993e69ceba62dda51e943c1e6accb1 Mon Sep 17 00:00:00 2001
From: Ertugrul Karademir <ekarademir@gmail.com>
Date: Tue, 1 Sep 2020 23:41:22 +0100
Subject: [PATCH] fix: Helm giving linting error when no ingress or ingressGrpc
 extraPaths are given (#435)

* Added conditionals for ingress extraPaths

* Added conditionals for ingressGrpc extraPaths

* Version bump
---
 charts/argo-cd/Chart.yaml                             |  2 +-
 .../argo-cd/templates/argocd-server/ingress-grpc.yaml | 11 ++++++++---
 charts/argo-cd/templates/argocd-server/ingress.yaml   |  6 +++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 36849a20..6414551e 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.6.2"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 2.6.2
+version: 2.6.3
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
index 8ce8b8fc..d2894273 100644
--- a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
@@ -2,6 +2,7 @@
 {{- $serviceName := include "argo-cd.server.fullname" . -}}
 {{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
 {{- $paths := .Values.server.ingressGrpc.paths -}}
+{{- $extraPaths := .Values.server.ingressGrpc.extraPaths -}}
 {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
 apiVersion: networking.k8s.io/v1beta1
 {{ else }}
@@ -33,7 +34,9 @@ spec:
     - host: {{ $host }}
       http:
         paths:
-  {{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
+  {{- if $extraPaths }}
+  {{- toYaml $extraPaths | nindent 10 }}
+  {{- end -}}
   {{- range $p := $paths }}
           - path: {{ $p }}
             backend:
@@ -44,7 +47,9 @@ spec:
   {{- else }}
     - http:
         paths:
-  {{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
+  {{- if $extraPaths }}
+  {{- toYaml $extraPaths | nindent 10 }}
+  {{- end -}}
   {{- range $p := $paths }}
           - path: {{ $p }}
             backend:
@@ -56,4 +61,4 @@ spec:
   tls:
 {{- toYaml .Values.server.ingressGrpc.tls | nindent 4 }}
   {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index 468de536..4be764a3 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -34,7 +34,9 @@ spec:
     - host: {{ $host }}
       http:
         paths:
+  {{- if $extraPaths }}
   {{- toYaml $extraPaths | nindent 10 }}
+  {{- end }}
   {{- range $p := $paths }}
           - path: {{ $p }}
             backend:
@@ -45,7 +47,9 @@ spec:
   {{- else }}
     - http:
         paths:
+  {{- if $extraPaths }}
   {{- toYaml $extraPaths | nindent 10 }}
+  {{- end }}
   {{- range $p := $paths }}
           - path: {{ $p }}
             backend:
@@ -57,4 +61,4 @@ spec:
   tls:
 {{- toYaml .Values.server.ingress.tls | nindent 4 }}
   {{- end -}}
-{{- end -}}
\ No newline at end of file
+{{- end -}}