From 341a114b1e274b3cd0a207e885d11c14b435f923 Mon Sep 17 00:00:00 2001 From: Erik Lund Jensen Date: Thu, 14 May 2020 17:35:23 +0200 Subject: [PATCH] Optional override servicePort in ingress When using sslpassthrough the servicePort must be https. Signed-off-by: Erik Lund Jensen --- charts/argo-cd/templates/argocd-server/ingress.yaml | 2 +- charts/argo-cd/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml index df2f93ce..1e7e127a 100644 --- a/charts/argo-cd/templates/argocd-server/ingress.yaml +++ b/charts/argo-cd/templates/argocd-server/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.server.ingress.enabled -}} {{- $serviceName := include "argo-cd.server.fullname" . -}} -{{- $servicePort := .Values.server.service.servicePortHttp -}} +{{- $servicePort := default .Values.server.service.servicePortHttp .Values.server.ingress.servicePort -}} {{- $paths := .Values.server.ingress.paths -}} {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} apiVersion: networking.k8s.io/v1beta1 diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index b47acbbf..eeb1a612 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -432,6 +432,9 @@ server: annotations: {} labels: {} + # Override service port when using SSL passthrough ingress + # servicePort: 443 + ## Argo Ingress. ## Hostnames must be provided if Ingress is enabled. ## Secrets must be manually created in the namespace