diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index adb04213..f791b4d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,8 @@
# Contributing to Pinniped
+Pinniped is better because of our contributors and [maintainers](MAINTAINERS.md). It is because of you that we can bring
+great software to the community.
+
Contributions to Pinniped are welcome. Here are some things to help you get started.
## Code of Conduct
@@ -14,24 +17,13 @@ See [SCOPE.md](./SCOPE.md) for some guidelines about what we consider in and out
The near-term and mid-term roadmap for the work planned for the project [maintainers](MAINTAINERS.md) is documented in [ROADMAP.md](ROADMAP.md).
-## Community Meetings
-
-Pinniped is better because of our contributors and [maintainers](MAINTAINERS.md). It is because of you that we can bring great
-software to the community. Please join us during our online community meetings,
-occurring every first and third Thursday of the month at 9 AM PT / 12 PM ET.
-Use [this Zoom Link](https://go.pinniped.dev/community/zoom)
-to attend and add any agenda items you wish to discuss
-to [the notes document](https://hackmd.io/rd_kVJhjQfOvfAWzK8A3tQ?view).
-Join our [Google Group](https://groups.google.com/g/project-pinniped) to receive invites to this meeting.
-
-If the meeting day falls on a US holiday, please consider that occurrence of the meeting to be canceled.
-
## Discussion
Got a question, comment, or idea? Please don't hesitate to reach out
via GitHub [Discussions](https://github.com/vmware-tanzu/pinniped/discussions),
GitHub [Issues](https://github.com/vmware-tanzu/pinniped/issues),
-or in the Kubernetes Slack Workspace within the [#pinniped channel](https://kubernetes.slack.com/archives/C01BW364RJA).
+or in the Kubernetes Slack Workspace within the [#pinniped channel](https://go.pinniped.dev/community/slack).
+Join our [Google Group](https://go.pinniped.dev/community/group) to receive updates and meeting invitations.
## Issues
diff --git a/README.md b/README.md
index dffc6ea6..07d9a847 100644
--- a/README.md
+++ b/README.md
@@ -21,27 +21,19 @@ Care to kick the tires? It's easy to [install and try Pinniped](https://pinniped
Got a question, comment, or idea? Please don't hesitate to reach out
via GitHub [Discussions](https://github.com/vmware-tanzu/pinniped/discussions),
GitHub [Issues](https://github.com/vmware-tanzu/pinniped/issues),
-or in the Kubernetes Slack Workspace within the [#pinniped channel](https://kubernetes.slack.com/archives/C01BW364RJA).
+or in the Kubernetes Slack Workspace within the [#pinniped channel](https://go.pinniped.dev/community/slack).
+Join our [Google Group](https://go.pinniped.dev/community/group) to receive updates and meeting invitations.
## Contributions
+Pinniped is better because of our contributors and [maintainers](MAINTAINERS.md). It is because of you that we can bring
+great software to the community.
+
Want to get involved? Contributions are welcome.
Please see the [contributing guide](CONTRIBUTING.md) for more information about reporting bugs, requesting features,
building and testing the code, submitting PRs, and other contributor topics.
-## Community meetings
-
-Pinniped is better because of our contributors and [maintainers](MAINTAINERS.md). It is because of you that we can bring great
-software to the community. Please join us during our online community meetings, occurring every first and third
-Thursday of the month at 9 AM PT / 12 PM ET.
-
-Use [this Zoom Link](https://go.pinniped.dev/community/zoom) to attend and add any agenda items you wish to
-discuss to [the notes document](https://go.pinniped.dev/community/agenda).
-Join our [Google Group](https://groups.google.com/g/project-pinniped) to receive invites to this meeting.
-
-If the meeting day falls on a US holiday, please consider that occurrence of the meeting to be canceled.
-
## Adopters
Some organizations and products using Pinniped are featured in [ADOPTERS.md](ADOPTERS.md).
diff --git a/ROADMAP.md b/ROADMAP.md
index 20854e08..88ea680b 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,37 +1,40 @@
+## Pinniped Project Roadmap
-## **Pinniped Project Roadmap**
+### About this document
+This document provides a high-level overview of the next big features the maintainers are planning to work on. This
+should serve as a reference point for Pinniped users and contributors to understand where the project is heading, and
+help determine if a contribution could be conflicting with a longer term plan.
+The [Pinniped project backlog](https://github.com/orgs/vmware-tanzu/projects/43/) is prioritized based on this roadmap,
+and it provides a more granular view of what the maintainers are working on a day-to-day basis.
-###
-**About this document**
+### How to help
-This document provides a high-level overview of the next big features the maintainers are planning to work on. This should serve as a reference point for Pinniped users and contributors to understand where the project is heading, and help determine if a contribution could be conflicting with a longer term plan. [Pinniped project backlog](https://github.com/orgs/vmware-tanzu/projects/43/) is prioritized based on this roadmap and it provides a more granular view of what the maintainers are working on a day-to-day basis.
+Discussion on the roadmap is welcomed. If you want to provide suggestions, use cases, and feedback to an item in the
+roadmap, please reach out to the maintainers using one of the methods described in the project's
+[README.md](https://github.com/vmware-tanzu/pinniped#discussion).
+[Contributions](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md) to Pinniped are also welcomed.
-###
-**How to help?**
+### How to add an item to the roadmap
-Discussion on the roadmap can take place in [community meetings](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md#meeting-with-the-maintainers). If you want to provide suggestions, use cases, and feedback to an item in the roadmap, please add them to the [meeting notes](https://hackmd.io/rd_kVJhjQfOvfAWzK8A3tQ) and we will discuss them during community meetings. Please review the roadmap to avoid potential duplicated effort.
-
-###
-**How to add an item to the roadmap?**
-
-One of the most important aspects in any open source community is the concept of proposals. Large changes to the codebase and / or new features should be preceded by a [proposal](https://github.com/vmware-tanzu/pinniped/tree/main/proposals) in our repo.
+One of the most important aspects in any open source community is the concept of proposals. Large changes to the
+codebase and / or new features should be preceded by
+a [proposal](https://github.com/vmware-tanzu/pinniped/tree/main/proposals) in our repo.
For smaller enhancements, you can open an issue to track that initiative or feature request.
We work with and rely on community feedback to focus our efforts to improve Pinniped and maintain a healthy roadmap.
+### Current Roadmap
-###
-**Current Roadmap**
-
-The following table includes the current roadmap for Pinniped. If you have any questions or would like to contribute to Pinniped, please attend a [community meeting](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md#meeting-with-the-maintainers) to discuss with our team. If you don't know where to start, we are always looking for contributors that will help us reduce technical, automation, and documentation debt. Please take the timelines & dates as proposals and goals. Priorities and requirements change based on community feedback, roadblocks encountered, community contributions, etc. If you depend on a specific item, we encourage you to attend community meetings to get updated status information, or help us deliver that feature by contributing to Pinniped.
-
-
+The following table includes the current roadmap for Pinniped. Please take the timelines and dates as proposals and
+goals. Priorities and requirements change based on community feedback, roadblocks encountered, community contributions,
+etc. If you depend on a specific item, we encourage you to reach out for updated status information, or help us deliver
+that feature by [contributing](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md) to Pinniped.
Last Updated: May 2022
|Theme|Description|Timeline|
|--|--|--|
|Improving Security Posture|Support Audit logging of security events related to Authentication |May/June 2022|
-|Improving Usability|Support for integrating with UI/Dashboards |May/June 2022|
+|Improving Usability|Support for integrating with UI/Dashboards |May/June 2022|
|Improving Security Posture| Secrets Rotation and Management |Q3 2022|
|Improving Security Posture|Session Management |Q4 2022|
-|Improving Security Posture|TLS hardening contd|Q4 2022|
+|Improving Security Posture|TLS hardening contd|Q4 2022|
diff --git a/hack/prepare-for-integration-tests.sh b/hack/prepare-for-integration-tests.sh
index 35a9800f..76c5edf0 100755
--- a/hack/prepare-for-integration-tests.sh
+++ b/hack/prepare-for-integration-tests.sh
@@ -175,8 +175,8 @@ if [[ "$skip_chromedriver_check" == "no" ]]; then
fi
fi
-# Require kubectl >= 1.18.x
-if [ "$(kubectl version --client=true --short | cut -d '.' -f 2)" -lt 18 ]; then
+# Require kubectl >= 1.18.x.
+if [ "$(kubectl version --client=true -o=json | grep gitVersion | cut -d '.' -f 2)" -lt 18 ]; then
log_error "kubectl >= 1.18.x is required, you have $(kubectl version --client=true --short | cut -d ':' -f2)"
exit 1
fi
diff --git a/proposals/1125_dynamic-supervisor-oidc-clients/README.md b/proposals/1125_dynamic-supervisor-oidc-clients/README.md
new file mode 100644
index 00000000..0862c70a
--- /dev/null
+++ b/proposals/1125_dynamic-supervisor-oidc-clients/README.md
@@ -0,0 +1,532 @@
+---
+title: "Dynamic Supervisor OIDC Clients"
+authors: [ "@cfryanr", "@enj" ]
+status: "in-review"
+sponsor: [ ]
+approval_date: ""
+---
+
+*Disclaimer*: Proposals are point-in-time designs and decisions. Once approved and implemented, they become historical
+documents. If you are reading an old proposal, please be aware that the features described herein might have continued
+to evolve since.
+
+# Dynamic Supervisor OIDC Clients
+
+## Problem Statement
+
+Pinniped can be used to provide authentication to Kubernetes clusters via `kubectl` for cluster users such as
+developers, devops teams, and cluster admins. However, sometimes these same users need to be able to authenticate to
+webapps running on these clusters to perform actions such as installing, configuring, and monitoring applications on the
+cluster. It would be fitting for Pinniped to also provide authentication for these types of webapps, to ensure that the
+same users can authenticate in exactly the same way, using the same identity provider, and resolving their identities to
+the same usernames and group memberships. Enabling this use case will require new features in Pinniped, which are
+proposed in this document.
+
+### How Pinniped Works Today (as of version v0.15.0)
+
+Each
+[FederationDomain](https://github.com/vmware-tanzu/pinniped/blob/main/generated/1.23/README.adoc#federationdomain)
+configured in the Pinniped Supervisor is an OIDC Provider issuer which implements
+the [OIDC authorization code flow](https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth).
+
+Today, the Pinniped Supervisor only allows one hardcoded OIDC client, called `pinniped-cli`. This client is only allowed
+to redirect authcodes to the CLI's localhost listener. This makes it intentionally impossible for this client to be used
+by a webapp running on the cluster (or anywhere else on the network). The `pinniped-cli` client is implicitly available
+on all FederationDomains configured in the Supervisor, since every FederationDomain allows users to authenticate
+themselves via the Pinniped CLI for `kubectl` integration.
+
+## Terminology / Concepts
+
+- See the [definition of a "client" in the OAuth 2.0 spec](https://datatracker.ietf.org/doc/html/rfc6749#section-1.1).
+ For the purposes of this proposal, a "client" is roughly equal to a webapp which wants to know the authenticated
+ identity of a user, and may want to perform actions as that user on clusters. An admin needs to allow the client to
+ learn about the identity of the users by registering the client with the Pinniped Supervisor.
+- See also the [OIDC terminology in the OIDC spec](https://openid.net/specs/openid-connect-core-1_0.html#Terminology).
+- The OIDC clients proposed in this document are "dynamic" in the sense that they can be configured and reconfigured on
+ a running Supervisor by the admin.
+
+## Proposal
+
+### Goals and Non-goals
+
+Goals for this proposal:
+
+- Allow Pinniped admins to configure applications (OIDC clients) other than the Pinniped CLI to interact with the
+ Supervisor.
+- Provide a mechanism which governs a client's access to the token exchange API for cluster-scoped tokens.
+ Not all webapps should have permission to act on behalf of the user with the Kubernetes API of the clusters,
+ so an admin must be able to configure which clients have this permission.
+- Provide a mechanism for requesting access to different aspects of a user identity, especially getting group
+ memberships or not, to allow the admin to exclude this potentially sensitive information for clients which do not need it.
+- Support a web UI based LDAP/ActiveDirectory login screen. This is needed to avoid having webapps handle the user's
+ password, which must only be seen by the Supervisor and the LDAP server. However, the details of this item have been
+ split out to a
+ [separate proposal document](https://github.com/vmware-tanzu/pinniped/tree/main/proposals/1113_ldap-ad-web-ui).
+ The feature was released in [v0.18.0](https://github.com/vmware-tanzu/pinniped/releases/tag/v0.18.0).
+- Client secrets must be stored encrypted or hashed, not in plain text.
+- Creation of client credentials on the operator's behalf - the server must generate any secrets.
+- The operator must be able to initiate manual rotation of client credentials.
+- Documentation describing the token exchanges a webapp backend must perform to interact with the Kubernetes API.
+
+Non-goals for this proposal:
+
+- Pinniped's scope is to provide authentication for cluster users. Providing authentication for arbitrary users to
+ arbitrary webapps is out of scope. The only proposed use case is providing the exact same identities that are provided
+ by using Pinniped's `kubectl` integration, which are the developers/devops/admin users of the cluster.
+- Supporting any OAuth/OIDC flow other
+ than [OIDC authorization code flow](https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth).
+- Implementing any self-service client registration API which would allow developers to register clients without
+ assistance from the admin of the Pinniped Supervisor app. Clients will be registered by the Pinniped admin user.
+- Implementing a consent screen. This would be clearly valuable but will be left as a potential future enhancement in
+ the interest of keeping the first draft of this feature smaller.
+- Orchestration of cluster-scoped token exchanges on behalf of the client. Webapps which want to make calls to the Kubernetes API of
+ clusters acting as the authenticated user will need to perform the rest of the token and credential exchange flow that
+ it currently implemented by the Pinniped CLI. Providing some kind of component or library to assist webapp developers
+ with these steps might be valuable but will be left as a potential future enhancement.
+- Supporting JWT-based client authentication as described in [RFC 7523](https://datatracker.ietf.org/doc/html/rfc7523).
+ For now, client secret basic authentication will be used at the Supervisor's token endpoint. This is left as a
+ potential future enhancement.
+- Supporting public clients (i.e. clients that are not required to authenticate at the Supervisor's token endpoint).
+- Supporting any policy around which users an OAuth client can interact with. Any user who can authenticate with
+ kubectl (which uses the static `pinniped-cli` OAuth client) will also be able to authenticate with dynamic clients.
+ This is left as a potential future enhancement.
+
+### Specification / How it Solves the Use Cases
+
+This document proposes supporting a new Custom Resource Definition (CRD) for the Pinniped Supervisor which allows the
+admin to create, update, and delete OIDC clients for the Supervisor.
+
+#### API Changes
+
+##### Configuring clients
+
+An example of the new CRD to define a client:
+
+```yaml
+apiVersion: oauth.supervisor.pinniped.dev/v1alpha1
+kind: OIDCClient
+metadata:
+ name: client.oauth.pinniped.dev-my-webapp-client
+ namespace: pinniped-supervisor
+spec:
+ allowedRedirectURIs:
+ - https://my-webapp.example.com/callback
+ allowedGrantTypes:
+ - authorization_code
+ - refresh_token
+ - urn:ietf:params:oauth:grant-type:token-exchange
+ allowedScopes:
+ - openid
+ - offline_access
+ - pinniped:request-audience
+ - username
+ - groups
+status:
+ phase: Error
+ totalClientSecrets: 0
+ conditions:
+ - type: Ready
+ status: False
+ reason: NoClientSecretFound
+ message: no client secret found (empty list in storage)
+```
+
+A brief description of each field:
+
+- `metadata.name`: The client ID, which is conceptually the username of the client. Note that `:` characters are not
+ allowed because the basic auth specification disallows them in usernames. Kubernetes custom resource name validation
+ already enforces that this field must be a DNS subdomain, which means it must consist of lower case alphanumeric
+ characters, '-' or '.', and must start and end with an alphanumeric character (i.e. we do not need to do anything
+ special to enforce that clients do not have a ":" in their name). See the audience confusion discussion below for
+ details on further restrictions that are applied to this field (i.e. required prefix). These names must start with
+ `client.oauth.pinniped.dev-`.
+- `metadata.namespace`: Only clients in the same namespace as the Supervisor will be honored. This prevents cluster
+ users who have write permission in other namespaces from changing the configuration of the Supervisor.
+- `allowedRedirectURIs`: The list of allowed redirect URI. Must be `https://` URIs, unless the host is `127.0.0.1`,
+ in which case `http://` will be allowed. Callbacks to localhost are allowed to support local app development use
+ cases, and should not be used in production (since it would not make sense to distribute the client's secret).
+- `allowedGrantTypes`: May only contain the following valid options:
+ - `authorization_code` allows the client to perform the authorization code grant flow, i.e. allows the webapp to
+ authenticate users. This grant must always be listed.
+ - `refresh_token` allows the client to perform refresh grants for the user to extend the user's session. This grant
+ must be listed if `allowedScopes` lists `offline_access`.
+ - `urn:ietf:params:oauth:grant-type:token-exchange` allows the client to perform RFC8693 token exchange, which is a
+ step in the process to be able to get a cluster credential for the user. This grant must be listed if
+ `allowedScopes` lists `pinniped:request-audience`.
+- `allowedScopes`: Decide what the client is allowed to request. Note that the client must also actually request
+ particular scopes during the authorization flow for the scopes to be granted. May only contain the following valid
+ options:
+ - `openid`: The client is allowed to request ID tokens. ID tokens only include the
+ [required claims](https://openid.net/specs/openid-connect-core-1_0.html#IDToken) by default (`iss`, `sub`, `aud`,
+ `exp`, `iat`). This scope must always be listed.
+ - `offline_access`: The client is allowed to request an initial refresh token during the authorization code grant
+ flow. This scope must be listed if `allowedGrantTypes` lists `refresh_token`.
+ - `pinniped:request-audience`: The client is allowed to request a new audience value during a RFC8693 token
+ exchange, which is a step in the process to be able to get a cluster credential for the user. `openid`,
+ `username` and `groups` scopes must be listed when this scope is present. This scope must be listed if
+ `allowedGrantTypes` lists `urn:ietf:params:oauth:grant-type:token-exchange`.
+ - `username`: The client is allowed to request that ID tokens contain the user's username. This is a newly
+ proposed scope which does not currently exist in the Supervisor. Without the `username` scope being requested and
+ allowed, the ID token would not contain the user's username.
+ - `groups`: The client is allowed to request that ID tokens contain the user's group membership, if their group
+ membership is discoverable by the Supervisor. This is a newly proposed scope which does not currently exist in the
+ Supervisor. Without the `groups` scope being requested and allowed, the ID token would not contain groups.
+- `phase`: This enum (`Pending`,`Ready`,`Error`) summarizes the overall status of the client (defaults to `Pending`).
+- `totalClientSecrets`: The number of client secrets that are currently associated with this client.
+- `conditions`: The result of validations performed by a controller on these CRs will be written by the controller on
+ the status. An example condition is shown above, and other conditions will also be added by the controller.
+
+All `.spec` list fields (i.e. all of them) will be validated to confirm that they do not contain any duplicates and are
+non-empty.
+
+Some other settings are implied and will not be configurable:
+
+- All clients must use [PKCE](https://oauth.net/2/pkce/) during the authorization code flow. There is a risk that some
+ client libraries might not support PKCE, but it is considered a modern best practice for OIDC.
+- All clients must use [client secret basic auth](https://datatracker.ietf.org/doc/html/rfc6749#section-2.3.1) for
+ authentication at the token endpoint. This is the most widely supported authentication method in client libraries and
+ is recommended by the OAuth 2.0 spec over the alternative of using query parameters in a POST body.
+- All clients are only allowed
+ to [use `code` as the `response_type`](https://openid.net/specs/openid-connect-core-1_0.html#AuthorizationExamples)
+ at the authorization endpoint.
+- All clients are only allowed to use the default or specify `query` as
+ the [`response_mode`](https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest) at the authorization
+ endpoint. This excludes clients from using `form_post`. We could consider allowing `form_post` in the future if it is
+ desired.
+
+The default scopes set by the `pinniped get kubeconfig` and `pinniped login oidc` commands will be updated to include
+the new `username` and `groups` scopes. These changes ensure that newly generated kubeconfigs from the latest pinniped
+CLI have the correct behavior going forward. Admins can always manually edit the resulting kubeconfig if they need to
+(or they could use an older pinniped CLI).
+
+To provide a nice table output for this API, the following printer columns will be used:
+
+```yaml
+- additionalPrinterColumns:
+ # this client is "dangerous" because it has access to user tokens that are valid against the Kubernetes API server
+ - jsonPath: '{range .spec.allowedScopes[?(@ == "pinniped:request-audience")]}{true}{end}{false}'
+ name: Privileged
+ type: boolean
+ - jsonPath: .status.phase
+ name: Status
+ type: string
+ - jsonPath: .status.totalClientSecrets
+ name: Total
+ type: integer
+ - jsonPath: .metadata.creationTimestamp
+ name: Age
+ type: date
+```
+
+##### Configuring client secrets
+
+We wish to avoid storage of client secrets (passwords) in plaintext. They must be stored encrypted or hashed and must
+be generated by the server.
+
+Perhaps the most common approach for this is to use [bcrypt](https://en.wikipedia.org/wiki/Bcrypt) with a random salt
+and a sufficiently high input cost. The salt protects against rainbow tables, and the input cost provides some
+protection against brute force guessing when the hashed password is leaked or stolen. However, the input cost also makes
+it slower for users to authenticate. The cost must be balanced against the current compute power available to attackers
+versus the inconvenience to users caused by a long pause during a genuine login attempt. Client authentication will
+be required by the token endpoint for authcode exchange, cluster-scoped token exchange, and refresh. This means
+that a typical login flow will require two client authentications (authcode exchange and cluster-scoped token exchange)
+and a typical refresh flow will also require two client authentications (refresh and cluster-scoped token exchange).
+The performance of the hashing algorithm will need to be sufficiently fast to support lots of users performing these
+flows simultaneously, while being sufficiently slow to discourage brute force attacks.
+
+Many OIDC Providers auto-generate client secrets and return the generated secret once (and only once) in their API or
+UI. This is good for ensuring that the secret contains a large amount of entropy by auto-generating long random strings
+using lots of possible characters. We will follow this approach.
+
+Even if the client secrets are hashed with bcrypt, the hashed value is still very confidential, due to the opportunities
+for brute forcing provided by knowledge of the hashed value. Confidential data in Kubernetes should be stored in Secret
+resources. This makes it explicit that the data is confidential.
+[Kubernetes best practices suggest](https://kubernetes.io/docs/concepts/configuration/secret/#information-security-for-secrets)
+that admins should use authorization policies to restrict read permission to Secrets as much as possible. Additionally,
+some clusters may use the Kubernetes feature to
+[encrypt Secrets at rest](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/), and thus reasonably expect
+that all confidential data is encrypted at rest. We will use Kubernetes secrets to store the client secret hash.
+
+CRDs are convenient to use, however, they have one core limitation - they cannot represent non-CRUD semantics. For
+example, the existing token credential request API could not be implemented using a CRD - it processes an incoming token
+and returns a client certificate without writing any data to etcd. Aggregated APIs have no such limitation. We will
+use an aggregated API to handle generation of client secrets.
+
+We will use the existing token credential request API as a model for the new OIDC client secret request API. Only the
+`create` verb will be supported (but this resource will be part of the `pinniped` category and will have no-op `list`
+implementation just like token credential request to prevent `kubectl get pinniped -A` from returning an error).
+
+```go
+type OIDCClientSecretRequest struct {
+ metav1.TypeMeta `json:",inline"`
+ metav1.ObjectMeta `json:"metadata,omitempty"` // metadata.name must be set to the client ID
+
+
+ Spec OIDCClientSecretRequestSpec `json:"spec"`
+ Status OIDCClientSecretRequestStatus `json:"status"`
+}
+
+type OIDCClientSecretRequestSpec struct {
+ GenerateNewSecret bool `json:"generateNewSecret"`
+ RevokeOldSecrets bool `json:"revokeOldSecrets"`
+}
+
+type OIDCClientSecretRequestStatus struct {
+ GeneratedSecret string `json:"generatedSecret,omitempty"`
+ TotalClientSecrets int `json:"totalClientSecrets"`
+}
+```
+
+Unlike token credential request, OIDC client secret request will require that `metadata.name` be set (so that it can
+determine what OAuth client is being referred to). When `.spec.generateNewSecret` is set to `true`, the response will
+provide the plaintext client secret via the `.status.generatedSecret` field. This is the only time that the plaintext
+client secret is made available. To aid in rotation, this API may be called multiple times with
+`.spec.generateNewSecret` set to `true` to cause the creation of a new client secret. The response will include the
+total number of client secrets (including any newly generated ones) that exist for the OAuth client in the
+`.status.totalClientSecrets` field. When the admin is ready, they may call the API with `.spec.revokeOldSecrets` set to
+`true` to cause all but the latest secret to be revoked. In the event of a client secret disclosure, a "hard" rotation
+may be performed by setting both `.spec.generateNewSecret` and `.spec.revokeOldSecrets` to `true` (this will revoke all
+pre-existing client secrets and return a newly generated secret). Leaving both of these fields set to `false` will
+simply return the number of existing client secrets via the `.status.totalClientSecrets` field (this same information is
+available via the `.status.totalClientSecrets` field of the `OIDCClient` resource).
+
+A dynamic client with many client secrets will be slower to authenticate (especially slow when failing to authenticate),
+since each hashed secret must be tried in sequence until one works, and the cost of trying each is relatively high.
+Administrators should take care to remember to come back to use this endpoint again to revoke the old client secrets
+once they are not needed anymore.
+
+An admin would interact with this API by using standard `kubectl` commands:
+
+```yaml
+apiVersion: oauth.virtual.supervisor.pinniped.dev/v1alpha1 # different group to avoid collision with the CRD
+kind: OIDCClientSecretRequest
+metadata:
+ name: client.oauth.pinniped.dev-j77kz
+ namespace: pinniped-supervisor
+spec:
+ generateNewSecret: true
+```
+
+Assuming the above yaml is stored in `file.yaml`, then running:
+
+`kubectl create -f file.yaml`
+
+would cause the server to respond with (note the custom columns in the table output):
+
+```
+NAMESPACE NAME SECRET TOTAL
+pinniped-supervisor client.oauth.pinniped.dev-j77kz 12..xz 2
+```
+
+All client secret hashes for an OAuth client will be stored in `pinniped-storage-oidc-client-secret-` where
+`metadata.uid` is a base32 encoded version of the UID generated by the Kuberentes API server for the `OIDCClient` custom resource instance that
+represents the given OAuth client. This secret will have an owner reference back to the `OIDCClient` to guarantee that
+it is automatically garbage collected if the `OIDCClient` is deleted. As the client secret lookup is UID based, it is
+resilient against any vulnerabilities that arise from the client ID being re-used over time. Using the UID also
+prevents any issues that could arise from giving the user control over the secret name (i.e. length issues, collision
+issues, validation issues, etc). Each client will have a 1:1 mapping with a Kubernetes secret - there would always be
+at most one Kubernetes secret per client. Since the secret name is deterministic based on the client UID, no reference
+field is required on the client. Kubernetes secrets have a size limit of ~1 MB which is enough to hold many thousands
+of hashes. This API will enforce a hard limit of 5 secrets per client (having this many client secrets is likely a
+configuration mistake).
+
+The bulk of the aggregated API server implementation would involve copy-pasting the concierge aggregated API server
+code and changing the API group strings. The interesting part of the implementation would be the rest storage
+implementation of the `OIDCClientSecretRequest` API. Normally this would be done via direct calls to etcd, but running
+etcd is onerous. Instead we would follow the same model we use for the fosite storage layer - the existing
+`crud.Storage` code will be re-used. Each Kubernetes secret would store a single JSON object with the following schema:
+
+```go
+type oidcClientSecretStorage struct {
+ // list of bcrypt hashes validated to have a cost of at least 15 (requires roughly a second to process)
+ SecretHashes [][]byte `json:"hashes"`
+ // set to "1" - updating this would require some form of migration
+ // this is not the same as crud.secretVersion which has remained at "1" for the lifetime of the project
+ // this is the first resource where we cannot simply bump the storage version and "drop" old data
+ Version string `json:"version"`
+}
+```
+
+Since an aggregated API is indistinguishable from any other Kubernetes REST API, no explanation will be required in
+regard to how RBAC should be handled for this API. Authentication is handled by the Kubernetes API server itself and
+the aggregated API server library code handles authorization automatically by delegating to the Kubernetes API server.
+We will need to manually invoke the `createValidation rest.ValidateObjectFunc` function that is provided to the rest
+storage because this is how admission is enforced (which would be required if the admin wanted to give a user the
+ability to create client secrets but only for specific clients - this limitation is because the name of a new object
+may not be known at authorization time).
+
+The OIDC client secret request API will support open API schema docs to make sure commands such as `kubectl explain
+oidcclientsecretrequests.spec` work (this is not true for the Concierge's token credential request today).
+
+##### Disallowing audience confusion
+
+Who decides the names of the dynamic client and the workload clusters?
+
+- The name of the dynamic client would be chosen by the admin of the Supervisor.
+- The name of the workload cluster is chosen by the admin of the workload cluster (potentially a different person or
+ automated process). We don’t currently limit the string which chooses the audience name for the workload cluster, so
+ it can be any non-empty string. The Supervisor is not aware of these strings in advance.
+
+Given that, there are two kinds of potential audience confusion for the token exchange.
+
+1. The ID token issued during the original authorization flow (before token exchange) will have an audience set to the
+ name of the dynamic client. If this client’s name happened to be the same name as the name of a workload cluster,
+ then the client could potentially skip the token exchange and use the original ID token to access the workload
+ cluster via the Concierge (acting as the user who logged in). These initial ID tokens were not meant to grant access
+ to any particular cluster.
+
+2. A user can use the public `pinniped-cli` client to log in and then to perform a token exchange to any audience value.
+ They could even ask for an audience which matches the name of an existing dynamic client to get back an ID token that
+ would appear as if it were issued to that dynamic client. Then they could try to find a way to use that ID token with
+ a webapp which uses that dynamic client to authenticate its users (although that may not be possible depending on the
+ implementation of the webapp).
+
+To address all of these issues we will:
+
+- Require a static, reserved prefix (`client.oauth.pinniped.dev-`) for all dynamic OAuth client IDs.
+- Disallow that prefix (`client.oauth.pinniped.dev-`) for audiences requested via the token exchange API.
+- Disallow the string `pinniped-cli` (the name of the static client) for audiences requested via the token exchange API.
+- Reserve a substring (`.oauth.pinniped.dev`) for audiences requested via the token exchange API for potential future
+ use. Any token exchange requesting an audience with that substring will be rejected. This leaves room to create other
+ categories of audience values in case that is needed in the future, e.g.
+ `static-client.oauth.pinniped.dev-some-client`.
+- All ID tokens issued by the supervisor will contain the `azp` claim and its value will always be set to the client ID
+ of the client that was used for the initial login flow. This is meant to prevent any information loss during flows
+ such as the token exchange API.
+- No changes are proposed for the `JWTAuthenticator` as it is meant to be interchangeable with the Kubernetes OIDC
+ server flags. Some environments use old versions of the concierge with newer versions of the supervisor and thus we
+ cannot rely on changes to the concierge being rolled out to enforce security contracts.
+- Implicit behavioral changes to APIs are avoided as they can be difficult to understand and reason about.
+
+The validation associated with dynamic clients will be used to enforce that clients have `metadata.name` set to a value
+that starts with `client.oauth.pinniped.dev-`. Users will be prevented from creating CRs without this prefix, thus
+it will not be possible to create a dynamic client CR with a name such as `pinniped-cli`.
+For the time being, the hardcoded `pinniped-cli` client will not be represented in the CRD API (for a few reasons, i.e.
+it is a public client while all dynamic clients will be confidential clients).
+
+This design subdivides all possible token exchange requested audience strings into several categories. A requested
+audience string may be either the word `pinniped-cli` (rejected), may contain the substring `.oauth.pinniped.dev`
+representing a dynamic client or other future reserved meaning (also rejected), or may be any other string representing
+a workload cluster (allowed). This categorization is backwards compatible because it allows pre-existing workload
+clusters which have pre-existing JWTAuthenticators to continue to work after upgrade with no migration or intervention
+required by the operator (as long as their audience values did not contain the substring `.oauth.pinniped.dev`,
+which would be highly unlikely in practice).
+
+We can help operators avoid accidentally using the reserved substring `.oauth.pinniped.dev` in their `JWTAuthenticator`
+audience values by enhancing the `pinniped get kubeconfig` command to treat this as an error. If the operator used an
+old version of the pinniped CLI to generate the kubeconfig in this scenario, the kubeconfig would generate but then
+logins using that kubeconfig would fail due to the token exchange API rejecting their requests. Enhancing the CLI to
+make it an error is for the convenience of providing faster feedback on a misconfigured system, although it is highly
+unlikely that any operator would accidentally choose such an audience name in practice.
+
+##### Client registry
+
+The supervisor's OIDC implementation currently performs live reads against the Kubernetes API (i.e. it does not use a
+cache). No performance impact has been observed from this implementation. A positive of this implementation is that
+the supervisor is always up-to-date with the latest state - i.e. if a session is deleted, it is immediately observed on
+the next API call that attempts to use that session. The dynamic client registry must avoid using a cache based
+implementation to ensure that is always up-to-date with the current config. Furthermore, the implementation must
+guarantee that deleting and recreating a client invalidates all sessions and client secrets associated with said client.
+Revocation of a client secret must invalidate all sessions that were authenticated using that client secret.
+
+##### Configuring association between clients and issuers
+
+There will be no configuration to associate a client with a particular issuer (i.e. FederationDomain). Just as the
+`pinniped-cli` OAuth client is available for use with all federation domains, all dynamic clients will be available for
+use with all federation domains.
+
+#### Upgrades
+
+No backwards incompatible changes to any existing Kubernetes API resource schema are proposed in this design.
+
+The `pinniped-cli` client needs to continue to act as before for backwards compatibility with existing installations of
+the Pinniped CLI on user's machines. Therefore, it will temporarily be excluded from any new scope-based requirements
+which would restrict the username and group memberships from being returned. When this exclusion is used, the
+supervisor will issue warnings and request that the user contact their admin for an updated kubeconfig. This exclusion
+will be dropped in a future release after sufficient time has passed for all users to have most likely upgraded.
+Having this temporary exclusion will allow mixing of old CLIs with new
+supervisors, and new CLIs with old supervisors. New CLIs will automatically include these new scopes in the kubeconfigs
+that they generate.
+
+#### Tests
+
+As usual, unit tests must be added for all new/changed code.
+
+Integration tests must be added to mimic the usage patterns of a webapp. Dynamic clients must be configured with
+various options to ensure that the options work as expected. Those clients must be used to perform the authcode flow,
+RFC8693 token exchanges, and TokenCredentialRequest calls. Negative tests must include validation failures on the new
+CRs, and failures to perform actions that are supposed to be disallowed on the client by its configuration.
+
+#### New Dependencies
+
+None are foreseen.
+
+#### Performance Considerations
+
+Extra calls will be made to the Kubernetes API to lookup dynamic OAuth clients. No performance impact is foreseen.
+
+Bcrypt operations are very expensive in practice. Having the Supervisor perform lots of bcrypt operations to authenticate
+dynamic clients at the token endpoint will increase the resource requirements of the Supervisor when dynamic clients
+are in use (even with a reasonable selection of bcrypt's cost parameter). The increase will be proportional to the
+number of users authenticating and refreshing their sessions using dynamic clients (i.e. webapps).
+
+#### Observability Considerations
+
+The usual error messages and log statements will be included for the new features similar to what is already
+implemented in the supervisor (along with the information present in the `.status` field of the `OIDCClient` resource).
+
+#### Security Considerations
+
+All flows performed against the token endpoint (authcode exchange, token exchange, and refresh) with a
+dynamic client must authenticate the client via client secret basic auth.
+
+The above section regarding the client registry implementation covers various security considerations.
+
+##### Ensuring reasonable client secrets
+
+Since the client secret is always generated by the supervisor, we can guarantee that it has the appropriate entropy.
+Furthermore, as the hash type and cost used is a server side implementation detail, we can change it over time (during
+login flows the client secret is presented in plaintext to the supervisor which allows for transparent hash upgrades).
+
+##### Preventing web apps from caching identities without re-validation
+
+Even with opaque tokens, once a web app learns the identity of a user, it is free to ignore the expiration on a
+short-lived token and cache that identity indefinitely. Thus, at a minimum, we must provide guidance to web apps to continue
+to perform the refresh grant at regular intervals to allow for group memberships to be updated, sessions to be revoked, etc.
+
+#### Usability Considerations
+
+Usability considerations pushed this design to use an aggregated API endpoint for client secret generation.
+This will allow the admin to continue to use the Kubernetes API (usually via kubectl) as their method for configuring
+the Supervisor, including configuring the client secrets on dynamic clients.
+
+#### Documentation Considerations
+
+The new CRD's API will be documented, along with any other changes to related CRDs. `kubectl explain` will be supported
+for all APIs, including aggregated APIs.
+
+A new documentation page will be provided to show an example of using these new features to configure auth for a webapp.
+Further documentation describing the token exchanges a webapp backend must perform to interact with the Kubernetes API
+will also be provided. Best practices around frequent refreshing of the user's identity will also be documented.
+
+### Other Approaches Considered
+
+Many other approaches were considered. See the `git` history of this file for details.
+
+## Open Questions
+
+None.
+
+## Answered Questions
+
+None.
+
+## Implementation Plan
+
+The Pinniped maintainers will implement these features.
+
+## Implementation PRs
+
+The implementation is in [PR #1181](https://github.com/vmware-tanzu/pinniped/pull/1181). During implementation,
+several PRs have been prepared against this PR's branch, and merged into the PR's branch when reviewed and ready.
+When the whole feature is finished, PR #1181 will be merged to `main` and released.
diff --git a/proposals/README.md b/proposals/README.md
index 706961cc..88029aad 100644
--- a/proposals/README.md
+++ b/proposals/README.md
@@ -37,7 +37,7 @@ subdirectory, create a `README.md` containing the core proposal. Include other f
understanding of the feature.
To make your new proposal known to all other contributors, please send a link to your new proposal PR on the Kubernetes
-Slack in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA)
+Slack in [#pinniped](https://go.pinniped.dev/community/slack)
or via the [Pinniped mailing list](mailto:project-pinniped@googlegroups.com).
Author(s) of proposals for major changes will give a time period of no less than five (5) working days for comment and
@@ -231,5 +231,5 @@ previous proposals for historical context when appropriate.
## Getting Help with the Proposal Process
Please reach out to the maintainers in the Kubernetes Slack Workspace within
-the [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) channel or on
+the [#pinniped](https://go.pinniped.dev/community/slack) channel or on
the [Pinniped mailing list](mailto:project-pinniped@googlegroups.com) with any questions.
diff --git a/site/config.yaml b/site/config.yaml
index 449d2059..493ab16c 100644
--- a/site/config.yaml
+++ b/site/config.yaml
@@ -5,7 +5,7 @@ theme: "pinniped"
params:
twitter_url: "https://twitter.com/projectpinniped"
github_url: "https://github.com/vmware-tanzu/pinniped"
- slack_url: "https://kubernetes.slack.com/messages/pinniped"
+ slack_url: "https://go.pinniped.dev/community/slack"
community_url: "https://go.pinniped.dev/community"
latest_version: v0.18.0
latest_codegen_version: 1.24
diff --git a/site/content/community/_index.html b/site/content/community/_index.html
index 8cf1e4fc..666f8544 100644
--- a/site/content/community/_index.html
+++ b/site/content/community/_index.html
@@ -35,11 +35,11 @@ layout: section
-
Please join us during our online Community Meetings, occurring every first and third Thursday of the month at 9 AM PT / 12 PM ET.
-
Use this Zoom link to attend and add any agenda items you wish to discuss to the notes document.
-
Join our Google Group to receive invites to the meeting
+
+
+
Join our Google Group to receive updates and invites to community meetings
Watch previous community meetings on our YouTube playlist
-
\ No newline at end of file
+
diff --git a/site/content/docs/_index.md b/site/content/docs/_index.md
index d78b655e..45e06f18 100644
--- a/site/content/docs/_index.md
+++ b/site/content/docs/_index.md
@@ -9,9 +9,13 @@ menu:
---
Pinniped is an authentication service for Kubernetes clusters.
-As a Kubernetes cluster administrator or user, you can learn how Pinniped works, see how to use it on your clusters, and dive into internals of Pinniped's APIs and architecture.
+As a Kubernetes cluster administrator or user, you can learn how Pinniped works, see how to use it on your clusters, and
+dive into internals of Pinniped's APIs and architecture.
-Have a question, comment, or idea? Please reach out via [GitHub Discussions](https://github.com/vmware-tanzu/pinniped/discussions) or [join the Pinniped community meetings]({{< ref "/community" >}}).
+Have a question, comment, or idea? Please reach out via
+[GitHub Issues](https://github.com/vmware-tanzu/pinniped/issues),
+[GitHub Discussions](https://github.com/vmware-tanzu/pinniped/discussions),
+or [join the Pinniped community]({{< ref "/community" >}}).
## New to Pinniped?
diff --git a/site/content/posts/2020-11-12-a-seal-of-approval.md b/site/content/posts/2020-11-12-a-seal-of-approval.md
index 0f14eecb..a88641f9 100644
--- a/site/content/posts/2020-11-12-a-seal-of-approval.md
+++ b/site/content/posts/2020-11-12-a-seal-of-approval.md
@@ -50,7 +50,7 @@ Let’s be clear: We’re not there yet, but that’s where we’re headed with
- Create a unified login experience across clusters regardless of provider or distribution
- Advance the state of the art in Kubernetes login security
-From contributing code to uploading documentation to sharing how you’d like to use Pinniped in the wild, there are many ways to get involved. Feel free to ask questions via [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack, or check out the [Contribute to Pinniped](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md) page for details on how to contribute to the Pinniped project. There you’ll find out how you can:
+From contributing code to uploading documentation to sharing how you’d like to use Pinniped in the wild, there are many ways to get involved. Feel free to ask questions via [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack, or check out the [Contribute to Pinniped](https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md) page for details on how to contribute to the Pinniped project. There you’ll find out how you can:
- Propose or request new features
- Try writing a plugin
diff --git a/site/content/posts/2021-06-02-first-ldap-release.md b/site/content/posts/2021-06-02-first-ldap-release.md
index 15f5a900..2c501c6d 100644
--- a/site/content/posts/2021-06-02-first-ldap-release.md
+++ b/site/content/posts/2021-06-02-first-ldap-release.md
@@ -65,7 +65,7 @@ We intend to add features in future releases to make it more convenient to integ
as an LDAP provider, and to include AD in our automated testing suite. Stay tuned.
In the meantime, please let us know if you run into any issues or concerns using your LDAP system.
-Feel free to ask questions via [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Feel free to ask questions via [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
or [create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository.
### Security Considerations
@@ -143,7 +143,7 @@ The Pinniped community continues to grow, and is a vital part of the project's s
We thrive on community feedback. Did you try our new LDAP features?
What else do you need from identity systems for your Kubernetes clusters?
-Find us in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Find us in [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
[create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository,
or start a [Discussion](https://github.com/vmware-tanzu/pinniped/discussions).
diff --git a/site/content/posts/2021-08-27-supporting-ad-oidc-workflows.md b/site/content/posts/2021-08-27-supporting-ad-oidc-workflows.md
index 2836569f..c9071d47 100644
--- a/site/content/posts/2021-08-27-supporting-ad-oidc-workflows.md
+++ b/site/content/posts/2021-08-27-supporting-ad-oidc-workflows.md
@@ -108,7 +108,7 @@ We thrive on community feedback.
Did you try our new LDAP or AD features?
What other configurations do you need for authenticating users to your Kubernetes clusters?
-Find us in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Find us in [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
[create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository,
or start a [Discussion](https://github.com/vmware-tanzu/pinniped/discussions).
diff --git a/site/content/posts/2022-01-18-idp-refresh-tls-ciphers-for-compliance.md b/site/content/posts/2022-01-18-idp-refresh-tls-ciphers-for-compliance.md
index a299144f..59b44215 100644
--- a/site/content/posts/2022-01-18-idp-refresh-tls-ciphers-for-compliance.md
+++ b/site/content/posts/2022-01-18-idp-refresh-tls-ciphers-for-compliance.md
@@ -139,7 +139,7 @@ We thrive on community feedback.
Did you try our new security hardening features?
What other configurations do you need for secure authentication of users to your Kubernetes clusters?
-Find us in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Find us in [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
[create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository,
or start a [Discussion](https://github.com/vmware-tanzu/pinniped/discussions).
diff --git a/site/content/posts/2022-04-15-fips-and-more.md b/site/content/posts/2022-04-15-fips-and-more.md
index 3ed252a3..47161b14 100644
--- a/site/content/posts/2022-04-15-fips-and-more.md
+++ b/site/content/posts/2022-04-15-fips-and-more.md
@@ -58,7 +58,7 @@ Are there other Identity Providers for which you want to see documentation simil
We thrive on community feedback and would like to hear more!
-Reach out to us in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Reach out to us in [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
[create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository,
or start a [discussion](https://github.com/vmware-tanzu/pinniped/discussions).
diff --git a/site/content/posts/2022-06-01-json-logging-ldap-ui.md b/site/content/posts/2022-06-01-json-logging-ldap-ui.md
index 6f95aac6..adab60e7 100644
--- a/site/content/posts/2022-06-01-json-logging-ldap-ui.md
+++ b/site/content/posts/2022-06-01-json-logging-ldap-ui.md
@@ -84,7 +84,7 @@ Have you tried any of our new features? Let us know what you think of our loggin
We thrive on community feedback and would like to hear more!
-Reach out to us in [#pinniped](https://kubernetes.slack.com/archives/C01BW364RJA) on Kubernetes Slack,
+Reach out to us in [#pinniped](https://go.pinniped.dev/community/slack) on Kubernetes Slack,
[create an issue](https://github.com/vmware-tanzu/pinniped/issues/new/choose) on our Github repository,
or start a [discussion](https://github.com/vmware-tanzu/pinniped/discussions).
diff --git a/site/redirects/go.pinniped.dev/netlify.toml b/site/redirects/go.pinniped.dev/netlify.toml
index 3511cebb..8f0367e9 100644
--- a/site/redirects/go.pinniped.dev/netlify.toml
+++ b/site/redirects/go.pinniped.dev/netlify.toml
@@ -1,12 +1,12 @@
[[redirects]]
from = "/community"
- to = "https://github.com/vmware-tanzu/pinniped/blob/main/CONTRIBUTING.md#meeting-with-the-maintainers"
+ to = "https://pinniped.dev/community"
status = 302
force = true
[[redirects]]
from = "/community/zoom"
- to = "https://vmware.zoom.us/j/93798188973?pwd=T3pIMWxReEQvcWljNm1admRoZTFSZz09"
+ to = "https://vmware.zoom.us/j/TodoUpdateThisLink"
status = 302
force = true
diff --git a/site/themes/pinniped/layouts/shortcodes/community.html b/site/themes/pinniped/layouts/shortcodes/community.html
index 03fed36a..19e6982c 100644
--- a/site/themes/pinniped/layouts/shortcodes/community.html
+++ b/site/themes/pinniped/layouts/shortcodes/community.html
@@ -5,10 +5,14 @@
It's because of you that we can bring great software to the community.
- Please join us during our online community meetings, occurring every first and third Thursday of the month at 9 AM PT / 12 PM ET.
- Use this Zoom link to attend and add any agenda items you wish to discuss to the notes document.
+ Connect with the community on GitHub
+ and Slack.
+
+
+
+
- Join our Google Group to receive invites to this meeting.
+ Join our Google Group to receive updates and meeting invitations.
diff --git a/test/integration/e2e_test.go b/test/integration/e2e_test.go
index 9bbf1589..aaf152f4 100644
--- a/test/integration/e2e_test.go
+++ b/test/integration/e2e_test.go
@@ -1353,8 +1353,15 @@ func requireUserCanUseKubectlWithoutAuthenticatingAgain(
expectedGroupsPlusAuthenticated := append([]string{}, expectedGroups...)
expectedGroupsPlusAuthenticated = append(expectedGroupsPlusAuthenticated, "system:authenticated")
- // Confirm we are the right user according to Kube by calling the whoami API.
- kubectlCmd3 := exec.CommandContext(ctx, "kubectl", "create", "-f", "-", "-o", "yaml", "--kubeconfig", kubeconfigPath)
+ // Confirm we are the right user according to Kube by calling the WhoAmIRequest API.
+ // Use --validate=false with this command because running this command against any cluster which has
+ // the ServerSideFieldValidation feature gate enabled causes this command to return an RBAC error
+ // complaining that this user does not have permission to list CRDs:
+ // error validating data: failed to check CRD: failed to list CRDs: customresourcedefinitions.apiextensions.k8s.io is forbidden:
+ // User "pinny" cannot list resource "customresourcedefinitions" in API group "apiextensions.k8s.io" at the cluster scope; if you choose to ignore these errors, turn validation off with --validate=false
+ // While it is true that the user cannot list CRDs, that fact seems unrelated to making a create call to the
+ // aggregated API endpoint, so this is a strange error, but it can be easily reproduced.
+ kubectlCmd3 := exec.CommandContext(ctx, "kubectl", "create", "-f", "-", "-o", "yaml", "--kubeconfig", kubeconfigPath, "--validate=false")
kubectlCmd3.Env = append(os.Environ(), env.ProxyEnv()...)
kubectlCmd3.Stdin = strings.NewReader(here.Docf(`
apiVersion: identity.concierge.%s/v1alpha1
@@ -1362,7 +1369,8 @@ func requireUserCanUseKubectlWithoutAuthenticatingAgain(
`, env.APIGroupSuffix))
kubectlOutput3, err := kubectlCmd3.CombinedOutput()
- require.NoError(t, err)
+ require.NoErrorf(t, err,
+ "expected no error but got error, combined stdout/stderr was:\n----start of output\n%s\n----end of output", kubectlOutput3)
whoAmI := deserializeWhoAmIRequest(t, string(kubectlOutput3), env.APIGroupSuffix)
require.Equal(t, expectedUsername, whoAmI.Status.KubernetesUserInfo.User.Username)