From 4bc2834e0c5e13861d32d5a463315fc4e5f0b77e Mon Sep 17 00:00:00 2001
From: Milos Hauser <16776599+hau21um@users.noreply.github.com>
Date: Tue, 11 Apr 2023 20:56:23 +0200
Subject: [PATCH] Option to set appProtocol for Argocd server https service
 port

Signed-off-by: Milos <milos.hauser@pricefx.com>
---
 charts/argo-cd/Chart.yaml                           | 4 ++--
 charts/argo-cd/templates/argocd-server/service.yaml | 3 +++
 charts/argo-cd/values.yaml                          | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index be815df3..3b4e0ab7 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.6.7
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.28.2
+version: 5.28.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -24,4 +24,4 @@ dependencies:
 annotations:
   artifacthub.io/changes: |
     - kind: added
-      description: Add log format and log level to dex.
+      description: Option to set appProtocol for Argocd server https service port
diff --git a/charts/argo-cd/templates/argocd-server/service.yaml b/charts/argo-cd/templates/argocd-server/service.yaml
index 879bdb32..3433e18d 100644
--- a/charts/argo-cd/templates/argocd-server/service.yaml
+++ b/charts/argo-cd/templates/argocd-server/service.yaml
@@ -30,6 +30,9 @@ spec:
     {{- if eq .Values.server.service.type "NodePort" }}
     nodePort: {{ .Values.server.service.nodePortHttps }}
     {{- end }}
+    {{- with .Values.server.service.servicePortHttpsAppProtocol }}
+    appProtocol: {{ . }}
+    {{- end }}
   selector:
     {{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.server.name) | nindent 4 }}
 {{- if eq .Values.server.service.type "LoadBalancer" }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 32b9060c..fb2487b1 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1765,6 +1765,8 @@ server:
     servicePortHttpName: http
     # -- Server service https port name, can be used to route traffic via istio
     servicePortHttpsName: https
+    # -- Server service https port appProtocol. (should be upper case - i.e. HTTPS)
+    # servicePortHttpsAppProtocol: HTTPS
     # -- LoadBalancer will get created with the IP specified in this field
     loadBalancerIP: ""
     # -- Source IP ranges to allow access to service from