From 41832369fd211c938477c876d8ec7d22e1910b80 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Mon, 14 Dec 2020 10:56:57 -0600 Subject: [PATCH 1/2] Upgrade the Dex we use for local testing to v2.27.0. Signed-off-by: Matt Moyer --- test/deploy/dex/dex.yaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/test/deploy/dex/dex.yaml b/test/deploy/dex/dex.yaml index cee9f382..9f7e4c41 100644 --- a/test/deploy/dex/dex.yaml +++ b/test/deploy/dex/dex.yaml @@ -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 + From b009cee877a51fd708c3752f9f1c37c3abf79843 Mon Sep 17 00:00:00 2001 From: Andrew Keesler Date: Thu, 17 Dec 2020 13:37:20 -0500 Subject: [PATCH 2/2] Add Margo and Mo as maintainers of Pinniped Signed-off-by: Margo Crawford --- MAINTAINERS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index bc80e218..2cfa632e 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -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/) |