From b0235aec0c97a50160191799f512b5054c943a2f Mon Sep 17 00:00:00 2001
From: Ertugrul Karademir <ertugrul.karademir@oliverwyman.com>
Date: Mon, 31 Aug 2020 11:38:53 +0100
Subject: [PATCH] Added conditionals for ingressGrpc extraPaths

---
 .../argo-cd/templates/argocd-server/ingress-grpc.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 -}}