diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 1c4a9697..2852926b 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,21 +4,22 @@ This is the current list of maintainers for the Pinniped project. | Maintainer | GitHub ID | Affiliation | | --------------- | --------- | ----------- | -| Margo Crawford | [margocrawf](https://github.com/margocrawf) | [VMware](https://www.github.com/vmware/) | -| Mo Khan | [enj](https://github.com/enj) | [VMware](https://www.github.com/vmware/) | | Anjali Telang | [anjaltelang](https://github.com/anjaltelang) | [VMware](https://www.github.com/vmware/) | | Ryan Richard | [cfryanr](https://github.com/cfryanr) | [VMware](https://www.github.com/vmware/) | +| Ben Petersen | [benjaminapetersen](https://github.com/benjaminapetersen) | [VMware](https://www.github.com/vmware/) | ## Emeritus Maintainers * Andrew Keesler, [ankeesler](https://github.com/ankeesler) * Pablo Schuhmacher, [pabloschuhmacher](https://github.com/pabloschuhmacher) * Matt Moyer, [mattmoyer](https://github.com/mattmoyer) +* Margo Crawford, [margocrawf](https://github.com/margocrawf) +* Mo Khan, [enj](https://github.com/enj) ## Pinniped Contributors & Stakeholders | Feature Area | Lead | | ----------------------------- | :---------------------: | -| Technical Lead | Mo Khan (enj) | +| Technical Lead | Ryan Richard (cfryanr) | | Product Management | Anjali Telang (anjaltelang) | | Community Management | Nigel Brown (pnbrown) | diff --git a/hack/prepare-supervisor-on-kind.sh b/hack/prepare-supervisor-on-kind.sh index 6a573b1c..a56e5970 100755 --- a/hack/prepare-supervisor-on-kind.sh +++ b/hack/prepare-supervisor-on-kind.sh @@ -254,6 +254,13 @@ EOF --dry-run=client --output yaml | kubectl apply -f - fi +if [[ "$OSTYPE" == "darwin"* ]]; then + certificateAuthorityData=$(cat "$root_ca_crt_path" | base64) +else + # Linux base64 requires an extra flag to keep the output on one line. + certificateAuthorityData=$(cat "$root_ca_crt_path" | base64 -w 0) +fi + # Make a JWTAuthenticator which respects JWTs from the Supervisor's issuer. # The issuer URL must be accessible from within the cluster for OIDC discovery. cat <The Pinniped Project Team:
-
+
-

Margo Crawford

-

Engineer

-
-
-
-
-
-

Mo Khan

-

Engineer

-
-
-
-
-
-

Nanci Lancaster

+

Nigel Brown

Community Manager

@@ -37,8 +23,15 @@

Engineer

+
+
+
+

Ben Petersen

+

Engineer

+
+

Contributing:

The Pinniped project team welcomes contributions from the community, please see the contributor’s guide for more information.

- \ No newline at end of file + diff --git a/site/themes/pinniped/static/img/ben-petersen.png b/site/themes/pinniped/static/img/ben-petersen.png new file mode 100644 index 00000000..87100081 Binary files /dev/null and b/site/themes/pinniped/static/img/ben-petersen.png differ diff --git a/site/themes/pinniped/static/img/margo-crawford.png b/site/themes/pinniped/static/img/margo-crawford.png deleted file mode 100644 index 6268f764..00000000 Binary files a/site/themes/pinniped/static/img/margo-crawford.png and /dev/null differ diff --git a/site/themes/pinniped/static/img/mo-khan.png b/site/themes/pinniped/static/img/mo-khan.png deleted file mode 100644 index 8c4d47f9..00000000 Binary files a/site/themes/pinniped/static/img/mo-khan.png and /dev/null differ diff --git a/site/themes/pinniped/static/img/nanci-lancaster.png b/site/themes/pinniped/static/img/nanci-lancaster.png deleted file mode 100644 index acf03758..00000000 Binary files a/site/themes/pinniped/static/img/nanci-lancaster.png and /dev/null differ diff --git a/site/themes/pinniped/static/img/nigel-brown.png b/site/themes/pinniped/static/img/nigel-brown.png new file mode 100644 index 00000000..63124eb9 Binary files /dev/null and b/site/themes/pinniped/static/img/nigel-brown.png differ