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.

Sign up for GitHub

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 for Ingress when enabled #100

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+10 −3
Open

Use HTTPS port for Ingress when enabled #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dab52f2
fix: Use HTTPS port for Ingress when enabled
JoooostB Dec 1, 2022
190dc29
docs:(charts/dex): add docs annotation for artifacthub
JoooostB Dec 1, 2022
7015adb
chore:(charts/dex): remove the part about updating Dex version
JoooostB Dec 6, 2022
372f006
chore:(charts/dex): Minor release instead of patch
JoooostB Dec 6, 2022
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
9 changes: 6 additions & 3 deletions charts/dex/Chart.yaml
View file
Open in desktop
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,11 @@ 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:
- 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
3 changes: 3 additions & 0 deletions charts/dex/templates/ingress.yaml
View file
Open in desktop
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.https.enabled -}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to avoid forcing HTTPS there. Let's make it optional.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What method would you prefer to make this optional? Add an extra option to the Ingress object?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nabokihms Really would appreciate this being merged in, maybe some more information on whether we should add a flag to the ingress to use HTTPS port?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay. Yes, I think an option for an ingress object will work.

{{- $svcPort = .Values.service.ports.https.port -}}
JoooostB marked this conversation as resolved.
Show resolved Hide resolved
{{- 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
1 change: 1 addition & 0 deletions charts/dex/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down