Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use HTTPS port in Ingress when enabled #102

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/dex/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
type: application
name: dex
version: 0.12.1
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.
Expand All @@ -21,8 +21,8 @@ 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 ingress.https is true.
artifacthub.io/images: |
- name: dex
image: ghcr.io/dexidp/dex:v2.35.3
3 changes: 3 additions & 0 deletions charts/dex/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "dex.fullname" . -}}
{{- $svcPort := .Values.service.ports.http.port -}}
{{- if .Values.ingress.https -}}
{{- $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}}
Expand Down
3 changes: 3 additions & 0 deletions charts/dex/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ ingress:
# -- Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/).
enabled: false

# -- Enable ingress to target https container port, https.enabled must be true
https: false

# -- Ingress [class name](https://kubernetes.io/docs/concepts/services-networking/ingress/#ingress-class).
className: ""

Expand Down