From 656319aa7ee8401820cae58813e0beb269cb4ca9 Mon Sep 17 00:00:00 2001 From: Travis Groth Date: Mon, 24 Feb 2020 18:25:57 -0500 Subject: [PATCH] Fix TLS documentation and IDP config validation (#64) --- charts/pomerium/Chart.yaml | 2 +- charts/pomerium/README.md | 2 +- charts/pomerium/templates/_helpers.tpl | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/pomerium/Chart.yaml b/charts/pomerium/Chart.yaml index 2f3dd5f4..f7dfcc2b 100644 --- a/charts/pomerium/Chart.yaml +++ b/charts/pomerium/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: pomerium -version: 6.0.0 +version: 6.0.1 appVersion: 0.6.2 home: http://www.pomerium.io/ icon: https://www.pomerium.io/logo-long.svg diff --git a/charts/pomerium/README.md b/charts/pomerium/README.md index b2545da4..e61a058c 100644 --- a/charts/pomerium/README.md +++ b/charts/pomerium/README.md @@ -161,7 +161,7 @@ A full listing of Pomerium's configuration variables can be found on the [config | `ingress.enabled` | Enables Ingress for pomerium | `true` | | `ingress.annotations` | Ingress annotations. Ensure you set appropriate annotations for TLS backend and large URLs if using Azure. | `{}` | | `ingress.hosts` | Ingress accepted hostnames | `[]` | -| `ingress.tls` | Ingress TLS configuration | `[]` | +| `ingress.secretName` | Ingress TLS certificate secret name | `[]` | | `metrics.enabled` | Enable prometheus metrics endpoint | `false` | | `metrics.port` | Prometheus metrics endpoint port | `9090` | | `cache.nameOverride` | Name of the cache service. | `cache` | diff --git a/charts/pomerium/templates/_helpers.tpl b/charts/pomerium/templates/_helpers.tpl index ffc0c07a..f9656ba9 100644 --- a/charts/pomerium/templates/_helpers.tpl +++ b/charts/pomerium/templates/_helpers.tpl @@ -138,7 +138,9 @@ Adapted from : https://github.com/helm/charts/blob/master/stable/drone/templates */}} {{- define "pomerium.providerOK" -}} {{- if .Values.authenticate.idp -}} - {{- if eq .Values.authenticate.idp.clientID "" -}} + {{- if .Values.config.existingSecret -}} + true + {{- else if eq .Values.authenticate.idp.clientID "" -}} false {{- else if eq .Values.authenticate.idp.clientSecret "" -}} false