Skip to content

Commit

Permalink
sync repos
Browse files Browse the repository at this point in the history
  • Loading branch information
desimone committed Jun 6, 2019
1 parent 480b6d0 commit 4c7f319
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 23 deletions.
1 change: 1 addition & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
approvers:
- desimone
- travisgroth
reviewers:
- desimone
- victornoel
Expand Down
21 changes: 21 additions & 0 deletions ci/default-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
config:
policy:
- from: httpbin.corp.pomerium.io
to: http://httpbin
allowed_domains:
- pomerium.io
- from: external-httpbin.corp.pomerium.io
to: httpbin.org
allowed_domains:
- gmail.com
- from: weirdlyssl.corp.pomerium.io
to: http://neverssl.com
allowed_users:
- [email protected]
allowed_groups:
- admins
- developers
- from: hello.corp.pomerium.io
to: http://hello:8080
allowed_groups:
- admins
2 changes: 1 addition & 1 deletion templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/instance: {{ .Release.Name }}
data:
config.yaml:
config.yaml: |
{{- if and .Values.config.existingPolicy .Values.config.extraOpts }}
{{ fail "Cannot use config.extraOpts with config.existingPolicy" }}
{{- end }}
Expand Down
24 changes: 2 additions & 22 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,6 @@ config:
extraOpts: {}
existingPolicy: ""
policy: {}
# policy:
# - from: httpbin.corp.pomerium.io
# to: http://httpbin
# allowed_domains:
# - pomerium.io
# - from: external-httpbin.corp.pomerium.io
# to: httpbin.org
# allowed_domains:
# - gmail.com
# - from: weirdlyssl.corp.pomerium.io
# to: http://neverssl.com
# allowed_users:
# - [email protected]
# allowed_groups:
# - admins
# - developers
# - from: hello.corp.pomerium.io
# to: http://hello:8080
# allowed_groups:
# - admins

authenticate:
# fullnameOverride: authenticate
Expand Down Expand Up @@ -79,7 +59,7 @@ service:
externalPort: 443
annotations:
{}
# === GKE load balancer tweaks; default on until I can figure out
# === GKE load balancer tweaks; default on until I can figure out
# how the hell to escape this string from the helm CLI
# cloud.google.com/app-protocols: '{"https":"HTTPS"}'
labels: {}
Expand All @@ -97,7 +77,7 @@ ingress:
# kubernetes.io/ingress.class: nginx
# nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
# nginx.ingress.kubernetes.io/proxy-buffer-size: "16k"
# === GKE load balancer tweaks; default on until I can figure out
# === GKE load balancer tweaks; default on until I can figure out
# how the hell to escape this string from the helm CLI
# kubernetes.io/ingress.allow-http: "false"
resources:
Expand Down

0 comments on commit 4c7f319

Please sign in to comment.