diff --git a/charts/dex/templates/ingress.yaml b/charts/dex/templates/ingress.yaml index 0b881d04..e21a06ff 100644 --- a/charts/dex/templates/ingress.yaml +++ b/charts/dex/templates/ingress.yaml @@ -1,6 +1,6 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "dex.fullname" . -}} -{{- $svcPort := .Values.service.ports.http.port -}} +{{- $svcPort := .Values.https.enabled | ternary .Values.service.ports.http.port .Values.service.port.https.port}} {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} diff --git a/charts/dex/templates/service.yaml b/charts/dex/templates/service.yaml index 8114e8d5..6eca09e5 100644 --- a/charts/dex/templates/service.yaml +++ b/charts/dex/templates/service.yaml @@ -50,6 +50,9 @@ spec: {{- end }} - name: telemetry port: 5558 + {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) >Values.service.ports.telemetry.nodePort }} + nodePort: {{ .Values.service.ports.telemetry.nodePort }} + {{- end}} targetPort: telemetry protocol: TCP {{- if semverCompare ">=1.20-0" .Capabilities.KubeVersion.GitVersion }}