Merge branch 'main' into more-opc-rename

This commit is contained in:
Ryan Richard 2020-12-17 12:10:19 -08:00 committed by GitHub
commit 65e7df1417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions

View File

@ -5,7 +5,9 @@ This is the current list of maintainers for the Pinniped project.
| Maintainer | GitHub ID | Affiliation |
| --------------- | --------- | ----------- |
| Andrew Keesler | [ankeesler](https://github.com/ankeesler) | [VMware](https://www.github.com/vmware/) |
| Margo Crawford | [margocrawf](https://github.com/margocrawf) | [VMware](https://www.github.com/vmware/) |
| Matt Moyer | [mattmoyer](https://github.com/mattmoyer) | [VMware](https://www.github.com/vmware/) |
| Mo Khan | [enj](https://github.com/enj) | [VMware](https://www.github.com/vmware/) |
| Pablo Schuhmacher | [pabloschuhmacher](https://github.com/pabloschuhmacher) | [VMware](https://www.github.com/vmware/) |
| Ryan Richard | [cfryanr](https://github.com/cfryanr) | [VMware](https://www.github.com/vmware/) |

View File

@ -12,7 +12,7 @@ storage:
config:
file: ":memory:"
web:
https: 0.0.0.0:443
https: 0.0.0.0:8443
tlsCert: /var/certs/dex.pem
tlsKey: /var/certs/dex-key.pem
oauth2:
@ -20,7 +20,7 @@ oauth2:
staticClients:
- id: pinniped-cli
name: 'Pinniped CLI'
#! we can't have "public: true" until https://github.com/dexidp/dex/pull/1822 lands in Dex.
public: true
redirectURIs:
- #@ "http://127.0.0.1:" + str(data.values.ports.cli) + "/callback"
- #@ "http://[::1]:" + str(data.values.ports.cli) + "/callback"
@ -76,7 +76,7 @@ spec:
spec:
containers:
- name: dex
image: quay.io/dexidp/dex:v2.10.0
image: ghcr.io/dexidp/dex:v2.27.0
imagePullPolicy: IfNotPresent
command:
- /usr/local/bin/dex
@ -84,7 +84,7 @@ spec:
- /etc/dex/cfg/config.yaml
ports:
- name: https
containerPort: 443
containerPort: 8443
volumeMounts:
- name: dex-config
mountPath: /etc/dex/cfg
@ -111,5 +111,7 @@ spec:
selector:
app: dex
ports:
- port: 443
name: https
- name: https
port: 443
targetPort: 8443