From 1f625ddd8e9dd7a634a87bdc8eb13f6505e97798 Mon Sep 17 00:00:00 2001
From: bergur88 <bergur88@gmail.com>
Date: Sun, 16 Feb 2020 23:17:37 +0000
Subject: [PATCH] fix: Make port names configurable for repo-server and
 controller (#236)

* allow changing of port names for application-controller and repo-server

* bump chart version

* chore: bump Chart version
---
 charts/argo-cd/Chart.yaml                                       | 2 +-
 .../templates/argocd-application-controller/service.yaml        | 2 +-
 charts/argo-cd/templates/argocd-repo-server/service.yaml        | 2 +-
 charts/argo-cd/values.yaml                                      | 2 ++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index b43a0734..0f3a5aa1 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.4.2"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.7.4
+version: 1.7.5
 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-application-controller/service.yaml b/charts/argo-cd/templates/argocd-application-controller/service.yaml
index bda37168..69f8ce52 100644
--- a/charts/argo-cd/templates/argocd-application-controller/service.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/service.yaml
@@ -17,7 +17,7 @@ metadata:
     app.kubernetes.io/component: {{ .Values.controller.name }}
 spec:
   ports:
-  - name: {{ .Values.controller.name }}
+  - name: {{ .Values.controller.service.portName }}
     port: {{ .Values.controller.service.port }}
     targetPort: {{ .Values.controller.containerPort }}
   selector:
diff --git a/charts/argo-cd/templates/argocd-repo-server/service.yaml b/charts/argo-cd/templates/argocd-repo-server/service.yaml
index 9ce1f144..169edd31 100644
--- a/charts/argo-cd/templates/argocd-repo-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/service.yaml
@@ -17,7 +17,7 @@ metadata:
   name: {{ template "argo-cd.repoServer.fullname" . }}
 spec:
   ports:
-  - name: repo-server
+  - name: {{ .Values.repoServer.service.portName }}
     protocol: TCP
     port: {{ .Values.repoServer.service.port }}
     targetPort: repo-server
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index afe9432e..f2d22c4c 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -86,6 +86,7 @@ controller:
     annotations: {}
     labels: {}
     port: 8082
+    portName: https-controller
 
   ## Node selectors and tolerations for server scheduling to nodes with taints
   ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
@@ -595,6 +596,7 @@ repoServer:
     annotations: {}
     labels: {}
     port: 8081
+    portName: https-repo-server
 
   ## Repo server metrics service configuration
   metrics: