Rename off of main

Signed-off-by: Ryan Richard <richardry@vmware.com>

deploy/supervisor/README.md

@@ -59,7 +59,7 @@ The most common ways are:
 
 1. Or, define a [TCP LoadBalancer Service](https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer)
    which is a layer 4 load balancer and does not terminate TLS. In this case, the Supervisor app will need to be
-   configured with TLS certificates and will terminate the TLS connection itself (see the section about OIDCProvider
+   configured with TLS certificates and will terminate the TLS connection itself (see the section about FederationDomain
    below). The LoadBalancer Service should be configured to use the HTTPS port 443 of the Supervisor pods as its `targetPort`.
 
    *Warning:* Do not expose the Supervisor's port 8080 to the public. It would not be secure for the OIDC protocol
@@ -132,12 +132,12 @@ spec:
 
 ### Configuring the Supervisor to Act as an OIDC Provider
 
-The Supervisor can be configured as an OIDC provider by creating `OIDCProvider` resources
+The Supervisor can be configured as an OIDC provider by creating `FederationDomain` resources
 in the same namespace where the Supervisor app was installed. For example:
 
 ```yaml
 apiVersion: config.supervisor.pinniped.dev/v1alpha1
-kind: OIDCProvider
+kind: FederationDomain
 metadata:
   name: my-provider
   # Assuming that this is the namespace where the supervisor was installed. This is the default in install-supervisor.yaml.
@@ -156,12 +156,12 @@ spec:
 #### Configuring TLS for the Supervisor OIDC Endpoints
 
 If you have terminated TLS outside the app, for example using an Ingress with TLS certificates, then you do not need to
-configure TLS certificates on the OIDCProvider.
+configure TLS certificates on the FederationDomain.
 
 If you are using a LoadBalancer Service to expose the Supervisor app outside your cluster, then you will
 also need to configure the Supervisor app to terminate TLS. There are two places to configure TLS certificates:
 
-1. Each `OIDCProvider` can be configured with TLS certificates, using the `spec.tls.secretName` field.
+1. Each `FederationDomain` can be configured with TLS certificates, using the `spec.tls.secretName` field.
 
 1. The default TLS certificate for all OIDC providers can be configured by creating a Secret called
 `pinniped-supervisor-default-tls-certificate` in the same namespace in which the Supervisor was installed.

deploy/supervisor/config.supervisor.pinniped.dev_federationdomains.yaml

@@ -6,22 +6,22 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.0
   creationTimestamp: null
-  name: oidcproviders.config.supervisor.pinniped.dev
+  name: federationdomains.config.supervisor.pinniped.dev
 spec:
   group: config.supervisor.pinniped.dev
   names:
     categories:
     - pinniped
-    kind: OIDCProvider
-    listKind: OIDCProviderList
-    plural: oidcproviders
-    singular: oidcprovider
+    kind: FederationDomain
+    listKind: FederationDomainList
+    plural: federationdomains
+    singular: federationdomain
   scope: Namespaced
   versions:
   - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: OIDCProvider describes the configuration of an OIDC provider.
+        description: FederationDomain describes the configuration of an OIDC provider.
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -50,14 +50,14 @@ spec:
                 minLength: 1
                 type: string
               tls:
-                description: TLS configures how this OIDCProvider is served over Transport
-                  Layer Security (TLS).
+                description: TLS configures how this FederationDomain is served over
+                  Transport Layer Security (TLS).
                 properties:
                   secretName:
                     description: "SecretName is an optional name of a Secret in the
                       same namespace, of type `kubernetes.io/tls`, which contains
                       the TLS serving certificate for the HTTPS endpoints served by
-                      this OIDCProvider. When provided, the TLS Secret named here
+                      this FederationDomain. When provided, the TLS Secret named here
                       must contain keys named `tls.crt` and `tls.key` that contain
                       the certificate and private key to use for TLS. \n Server Name
                       Indication (SNI) is an extension to the Transport Layer Security

deploy/supervisor/idp.supervisor.pinniped.dev_oidcidentityproviders.yaml

@@ -6,7 +6,7 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.0
   creationTimestamp: null
-  name: upstreamoidcproviders.idp.supervisor.pinniped.dev
+  name: oidcidentityproviders.idp.supervisor.pinniped.dev
 spec:
   group: idp.supervisor.pinniped.dev
   names:
@@ -14,10 +14,10 @@ spec:
     - pinniped
     - pinniped-idp
     - pinniped-idps
-    kind: UpstreamOIDCProvider
-    listKind: UpstreamOIDCProviderList
-    plural: upstreamoidcproviders
-    singular: upstreamoidcprovider
+    kind: OIDCIdentityProvider
+    listKind: OIDCIdentityProviderList
+    plural: oidcidentityproviders
+    singular: oidcidentityprovider
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
@@ -33,7 +33,7 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: UpstreamOIDCProvider describes the configuration of an upstream
+        description: OIDCIdentityProvider describes the configuration of an upstream
           OpenID Connect identity provider.
         properties:
           apiVersion:
@@ -183,7 +183,7 @@ spec:
                 x-kubernetes-list-type: map
               phase:
                 default: Pending
-                description: Phase summarizes the overall status of the UpstreamOIDCProvider.
+                description: Phase summarizes the overall status of the OIDCIdentityProvider.
                 enum:
                 - Pending
                 - Ready

deploy/supervisor/rbac.yaml

@@ -17,13 +17,13 @@ rules:
     resources: [secrets]
     verbs: [create, get, list, patch, update, watch, delete]
   - apiGroups: [config.supervisor.pinniped.dev]
-    resources: [oidcproviders]
+    resources: [federationdomains]
     verbs: [update, get, list, watch]
   - apiGroups: [idp.supervisor.pinniped.dev]
-    resources: [upstreamoidcproviders]
+    resources: [oidcidentityproviders]
     verbs: [get, list, watch]
   - apiGroups: [idp.supervisor.pinniped.dev]
-    resources: [upstreamoidcproviders/status]
+    resources: [oidcidentityproviders/status]
     verbs: [get, patch, update]
     #! We want to be able to read pods/replicasets/deployment so we can learn who our deployment is to set
     #! as an owner reference.

deploy/supervisor/z0_crd_overlay.yaml

@@ -4,13 +4,13 @@
 #@ load("@ytt:overlay", "overlay")
 #@ load("helpers.lib.yaml", "labels")
 
-#@overlay/match by=overlay.subset({"kind": "CustomResourceDefinition", "metadata":{"name":"oidcproviders.config.supervisor.pinniped.dev"}}), expects=1
+#@overlay/match by=overlay.subset({"kind": "CustomResourceDefinition", "metadata":{"name":"federationdomains.config.supervisor.pinniped.dev"}}), expects=1
 ---
 metadata:
   #@overlay/match missing_ok=True
   labels: #@ labels()
 
-#@overlay/match by=overlay.subset({"kind": "CustomResourceDefinition", "metadata":{"name":"upstreamoidcproviders.idp.supervisor.pinniped.dev"}}), expects=1
+#@overlay/match by=overlay.subset({"kind": "CustomResourceDefinition", "metadata":{"name":"oidcidentityproviders.idp.supervisor.pinniped.dev"}}), expects=1
 ---
 metadata:
   #@overlay/match missing_ok=True