From dab52f29d212013e5302e2b32ad424fdb7146b87 Mon Sep 17 00:00:00 2001 From: Joost Buskermolen Date: Thu, 1 Dec 2022 10:20:28 +0100 Subject: [PATCH 1/4] fix: Use HTTPS port for Ingress when enabled Signed-off-by: Joost Buskermolen --- charts/dex/templates/ingress.yaml | 3 +++ charts/dex/values.yaml | 1 + 2 files changed, 4 insertions(+) diff --git a/charts/dex/templates/ingress.yaml b/charts/dex/templates/ingress.yaml index bde85896..b89da733 100644 --- a/charts/dex/templates/ingress.yaml +++ b/charts/dex/templates/ingress.yaml @@ -1,6 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "dex.fullname" . -}} {{- $svcPort := .Values.service.ports.http.port -}} +{{- if .Values.https.enabled -}} +{{- $svcPort = .Values.service.ports.https.port -}} +{{- end -}} {{- 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/values.yaml b/charts/dex/values.yaml index 8d8830c5..55d0860f 100644 --- a/charts/dex/values.yaml +++ b/charts/dex/values.yaml @@ -178,6 +178,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + # nginx.ingress.kubernetes.io/backend-protocol: HTTPS # -- Ingress host configuration. # @default -- See [values.yaml](values.yaml). From 190dc295be4fad76bb481a5c7dc0fd3d24f85e88 Mon Sep 17 00:00:00 2001 From: Joost Buskermolen Date: Thu, 1 Dec 2022 10:27:57 +0100 Subject: [PATCH 2/4] docs:(charts/dex): add docs annotation for artifacthub Signed-off-by: Joost Buskermolen --- charts/dex/Chart.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml index b1a89007..90d31fb7 100644 --- a/charts/dex/Chart.yaml +++ b/charts/dex/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: dex -version: 0.12.1 +version: 0.12.2 appVersion: "2.35.3" kubeVersion: ">=1.14.0-0" description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors. @@ -23,6 +23,11 @@ annotations: artifacthub.io/changes: | - kind: changed description: "Update Dex to 2.35.3" + - kind: added + description: Enable HTTPS communication between Ingress and Service when https.enabled is true. + links: + - name: GitHub PR + url: https://github.com/dexidp/helm-charts/pull/100 artifacthub.io/images: | - name: dex image: ghcr.io/dexidp/dex:v2.35.3 From 7015adbd3188cd0c8712e08d94162371c5bc3292 Mon Sep 17 00:00:00 2001 From: Joost Buskermolen Date: Tue, 6 Dec 2022 08:57:54 +0100 Subject: [PATCH 3/4] chore:(charts/dex): remove the part about updating Dex version Signed-off-by: Joost Buskermolen --- charts/dex/Chart.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml index 90d31fb7..be660c6b 100644 --- a/charts/dex/Chart.yaml +++ b/charts/dex/Chart.yaml @@ -21,8 +21,6 @@ maintainers: url: https://sagikazarmark.hu annotations: artifacthub.io/changes: | - - kind: changed - description: "Update Dex to 2.35.3" - kind: added description: Enable HTTPS communication between Ingress and Service when https.enabled is true. links: From 372f006dbaeb8e66c90fb290523b64a886533196 Mon Sep 17 00:00:00 2001 From: Joost Buskermolen Date: Tue, 6 Dec 2022 09:06:20 +0100 Subject: [PATCH 4/4] chore:(charts/dex): Minor release instead of patch Signed-off-by: Joost Buskermolen --- charts/dex/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml index be660c6b..f65065fc 100644 --- a/charts/dex/Chart.yaml +++ b/charts/dex/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: dex -version: 0.12.2 +version: 0.13.0 appVersion: "2.35.3" kubeVersion: ">=1.14.0-0" description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors.