From e9a23f8a8014018f8f14a5286237d9d7a69e1b0d Mon Sep 17 00:00:00 2001 From: Travis Groth Date: Fri, 25 Mar 2022 12:05:11 -0400 Subject: [PATCH] [pomerium] reject conflicting ingress values (#283) --- charts/pomerium/Chart.yaml | 2 +- charts/pomerium/ci/ingress-values-redis.yaml | 2 ++ charts/pomerium/ci/ingress-values.yaml | 2 ++ charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml | 2 ++ charts/pomerium/templates/validation.yaml | 3 +++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/pomerium/Chart.yaml b/charts/pomerium/Chart.yaml index 13943cdb..53a51167 100644 --- a/charts/pomerium/Chart.yaml +++ b/charts/pomerium/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: pomerium -version: 31.0.0 +version: 31.0.1 appVersion: 0.17.0 home: http://www.pomerium.com/ icon: https://www.pomerium.com/img/icon.svg diff --git a/charts/pomerium/ci/ingress-values-redis.yaml b/charts/pomerium/ci/ingress-values-redis.yaml index e91f84fc..8c077526 100644 --- a/charts/pomerium/ci/ingress-values-redis.yaml +++ b/charts/pomerium/ci/ingress-values-redis.yaml @@ -6,3 +6,5 @@ ingressController: proxy: service: type: NodePort +ingress: + enabled: false diff --git a/charts/pomerium/ci/ingress-values.yaml b/charts/pomerium/ci/ingress-values.yaml index 8095f1db..96c88129 100644 --- a/charts/pomerium/ci/ingress-values.yaml +++ b/charts/pomerium/ci/ingress-values.yaml @@ -3,3 +3,5 @@ ingressController: proxy: service: type: NodePort +ingress: + enabled: false diff --git a/charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml b/charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml index 225a5878..813f3bdf 100644 --- a/charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml +++ b/charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml @@ -5,3 +5,5 @@ ingressController: proxy: service: type: NodePort +ingress: + enabled: false diff --git a/charts/pomerium/templates/validation.yaml b/charts/pomerium/templates/validation.yaml index 5e26194a..a92a8fa9 100644 --- a/charts/pomerium/templates/validation.yaml +++ b/charts/pomerium/templates/validation.yaml @@ -4,3 +4,6 @@ {{- if and .Values.ingressController.enabled (not (or .Values.config.generateTLS .Values.authenticate.ingress.tls.secretName )) -}} {{ fail "A TLS certificate must be available for Authenticate when using the ingress controller. Please set `config.generateTLS` or `authenticate.ingress.tls.secretName"}} {{- end -}} +{{- if and (and .Values.ingressController.enabled (not .Values.ingressController.operatorMode)) .Values.ingress.enabled -}} +{{ fail "`ingressController.enabled` is not compatible with `ingress.enabled` unless legacy `ingressController.operatorMode`" }} +{{- end -}}