diff --git a/charts/dex/Chart.yaml b/charts/dex/Chart.yaml index 09e8917e..e2d5dd14 100644 --- a/charts/dex/Chart.yaml +++ b/charts/dex/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: dex -version: 0.16.0 +version: 0.17.0 appVersion: "2.38.0" kubeVersion: ">=1.14.0-0" description: OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors. @@ -21,8 +21,8 @@ maintainers: url: https://sagikazarmark.hu annotations: artifacthub.io/changes: | - - kind: changed - description: "Dex 2.38.0 release" + - kind: added + description: updated ingress.yaml to allow https ports and updated service.yaml to support specifying telemetry nodeport artifacthub.io/images: | - name: dex image: ghcr.io/dexidp/dex:v2.38.0 diff --git a/charts/dex/README.md b/charts/dex/README.md index 42b5a1e5..dc230b2c 100644 --- a/charts/dex/README.md +++ b/charts/dex/README.md @@ -1,6 +1,6 @@ # dex -![version: 0.16.0](https://img.shields.io/badge/version-0.16.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.38.0](https://img.shields.io/badge/app%20version-2.38.0-informational?style=flat-square) ![kube version: >=1.14.0-0](https://img.shields.io/badge/kube%20version->=1.14.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex) +![version: 0.17.0](https://img.shields.io/badge/version-0.17.0-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 2.38.0](https://img.shields.io/badge/app%20version-2.38.0-informational?style=flat-square) ![kube version: >=1.14.0-0](https://img.shields.io/badge/kube%20version->=1.14.0--0-informational?style=flat-square) [![artifact hub](https://img.shields.io/badge/artifact%20hub-dex-informational?style=flat-square)](https://artifacthub.io/packages/helm/dex/dex) OpenID Connect (OIDC) identity and OAuth 2.0 provider with pluggable connectors. diff --git a/charts/dex/templates/ingress.yaml b/charts/dex/templates/ingress.yaml index 0b881d04..4c89d7ce 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.https.port .Values.service.port.http.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..bdce604f 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 }} diff --git a/charts/dex/values.yaml b/charts/dex/values.yaml index 7452791e..c4ef7b14 100644 --- a/charts/dex/values.yaml +++ b/charts/dex/values.yaml @@ -184,6 +184,9 @@ service: # -- (int) gRPC node port (when applicable) nodePort: + telemetry: + nodePort: null + ingress: # -- Enable [ingress](https://kubernetes.io/docs/concepts/services-networking/ingress/). enabled: false