From 191cc375c316594f978304585882f7c56ca83310 Mon Sep 17 00:00:00 2001
From: Piotr Kowalczyk <kowalczyk.p.4@pg.com>
Date: Mon, 23 Aug 2021 15:46:42 +0200
Subject: [PATCH] refactor: Parameterizing dex ports names due to istio 403
 errors

Signed-off-by: Piotr Kowalczyk <kowalczyk.p.4@pg.com>
---
 charts/argo-cd/Chart.yaml                 | 4 ++--
 charts/argo-cd/templates/dex/service.yaml | 4 ++--
 charts/argo-cd/values.yaml                | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 90543f56..72f417a7 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.1.0
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.13.1
+version: 3.13.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-cd/assets/logo.png
 keywords:
@@ -21,4 +21,4 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - "[Fixed]: Updated README.md for ArgoCD"
+    - "[Changed]: Parameterized dex service port names for istio-ingress 403 error"
diff --git a/charts/argo-cd/templates/dex/service.yaml b/charts/argo-cd/templates/dex/service.yaml
index 6fa77c4e..c93b085e 100644
--- a/charts/argo-cd/templates/dex/service.yaml
+++ b/charts/argo-cd/templates/dex/service.yaml
@@ -16,11 +16,11 @@ metadata:
 {{- end }}
 spec:
   ports:
-  - name: http
+  - name: {{ .Values.dex.servicePortHttpName }}
     protocol: TCP
     port: {{ .Values.dex.servicePortHttp }}
     targetPort: http
-  - name: grpc
+  - name: {{ .Values.dex.servicePortGrpcName }}
     protocol: TCP
     port: {{ .Values.dex.servicePortGrpc }}
     targetPort: grpc
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 8e637966..f73dfa87 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -280,8 +280,10 @@ dex:
   ## Dex deployment container ports
   containerPortHttp: 5556
   servicePortHttp: 5556
+  servicePortHttpName: tcp-http
   containerPortGrpc: 5557
   servicePortGrpc: 5557
+  servicePortGrpcName: grpc
   containerPortMetrics: 5558
   servicePortMetrics: 5558