Skip to content

Commit

Permalink
[pomerium] reject conflicting ingress values (#283)
Browse files Browse the repository at this point in the history
  • Loading branch information
travisgroth authored Mar 25, 2022
1 parent 7dacaab commit e9a23f8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion charts/pomerium/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions charts/pomerium/ci/ingress-values-redis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ ingressController:
proxy:
service:
type: NodePort
ingress:
enabled: false
2 changes: 2 additions & 0 deletions charts/pomerium/ci/ingress-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ ingressController:
proxy:
service:
type: NodePort
ingress:
enabled: false
2 changes: 2 additions & 0 deletions charts/pomerium/ci/insecure-ingress-secure-proxy-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ ingressController:
proxy:
service:
type: NodePort
ingress:
enabled: false
3 changes: 3 additions & 0 deletions charts/pomerium/templates/validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}

0 comments on commit e9a23f8

Please sign in to comment.