From 8ead2ffefd091eb964c9d1957415ea3af1671889 Mon Sep 17 00:00:00 2001
From: Stefan Reimer <stefan@zero-downtime.net>
Date: Thu, 30 Apr 2020 17:12:52 +0100
Subject: [PATCH] Allow server service port names to be configured.

Allows to route traffic via istio to split gRPC from http
---
 charts/argo-cd/README.md                            | 2 ++
 charts/argo-cd/templates/argocd-server/service.yaml | 4 ++--
 charts/argo-cd/values.yaml                          | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index f991b464..0ce42bd6 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -233,6 +233,8 @@ Helm v3 has removed the `install-crds` hook so CRDs are now populated by files i
 | server.service.labels | Server service labels | `{}` |
 | server.service.servicePortHttp | Server service http port | `80` |
 | server.service.servicePortHttps | Server service https port | `443` |
+| server.service.servicePortHttpName | Server service http port name, can be used to route traffic via istio | `http` |
+| server.service.servicePortHttpsName | Server service https port name, can be used to route traffic via istio | `https` |
 | server.service.loadBalancerSourceRanges | Source IP ranges to allow access to service from. | `[]` |
 | server.service.type | Server service type | `"ClusterIP"` |
 | server.serviceAccount.create | Create server service account | `true` |
diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 292bf94b..396b0c06 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -21,11 +21,11 @@ metadata:
 spec:
   type: {{ .Values.server.service.type }}
   ports:
-  - name: http
+  - name: {{ .Values.server.service.servicePortHttpName }}
     protocol: TCP
     port: {{ .Values.server.service.servicePortHttp }}
     targetPort: {{ .Values.server.name }}
-  - name: https
+  - name: {{ .Values.server.service.servicePortHttpsName }}
     protocol: TCP
     port: {{ .Values.server.service.servicePortHttps }}
     targetPort: {{ .Values.server.name }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 682a96f7..7b459a71 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -404,6 +404,8 @@ server:
     type: ClusterIP
     servicePortHttp: 80
     servicePortHttps: 443
+    servicePortHttpName: http
+    servicePortHttpsName: https
     loadBalancerIP: ""
     loadBalancerSourceRanges: []