From 5f4e8fbf589034ef5a75d84ff633c1e3fa11e41e Mon Sep 17 00:00:00 2001
From: Marco Kilchhofer <mkilchhofer@users.noreply.github.com>
Date: Wed, 21 Apr 2021 21:03:50 +0200
Subject: [PATCH] fix: Apply review changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

Co-authored-by: Oliver Bähler <oliverbaehler@hotmail.com>
---
 charts/argo-cd/templates/argocd-server/ingress-grpc.yaml | 8 ++++++++
 charts/argo-cd/templates/argocd-server/ingress.yaml      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
index ac030a1e..1f5fc4ea 100644
--- a/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress-grpc.yaml
@@ -43,7 +43,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
@@ -66,7 +70,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index 747112c0..1bd2c53c 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -43,7 +43,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}
@@ -66,7 +70,11 @@ spec:
               service:
                 name: {{ $serviceName }}
                 port:
+                  {{- if kindIs "float64" $servicePort }}
                   number: {{ $servicePort }}
+                  {{- else }}
+                  name: {{ $servicePort }}
+                  {{- end }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}