From 907ccb68f57a4fd063a952f15008ba3eab440e77 Mon Sep 17 00:00:00 2001 From: Matt Moyer Date: Fri, 18 Sep 2020 16:38:45 -0500 Subject: [PATCH] Move CredentialIssuerConfig into new "config.pinniped.dev" API group. Signed-off-by: Matt Moyer --- apis/{crdpinniped => config}/doc.go.tmpl | 6 +- apis/{crdpinniped => config}/types.go.tmpl | 2 +- .../v1alpha1/conversion.go.tmpl | 0 .../v1alpha1/defaults.go.tmpl | 0 .../v1alpha1/doc.go.tmpl | 6 +- .../v1alpha1/register.go.tmpl | 2 +- .../v1alpha1/types.go.tmpl | 0 cmd/pinniped/cmd/get_kubeconfig.go | 8 +- cmd/pinniped/cmd/get_kubeconfig_test.go | 22 +-- ....pinniped.dev_credentialissuerconfigs.yaml | 4 +- deploy/rbac.yaml | 2 +- generated/1.17/README.adoc | 30 +-- .../crdpinniped => 1.17/apis/config}/doc.go | 6 +- .../apis/{crdpinniped => config}/types.go | 2 +- .../v1alpha1/conversion.go | 0 .../v1alpha1/defaults.go | 0 .../apis/config}/v1alpha1/doc.go | 6 +- .../v1alpha1/register.go | 2 +- .../{crdpinniped => config}/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.conversion.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 .../v1alpha1/zz_generated.defaults.go | 0 .../apis/config}/zz_generated.deepcopy.go | 2 +- .../client/clientset/versioned/clientset.go | 18 +- .../versioned/fake/clientset_generated.go | 10 +- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../v1alpha1/config_client.go} | 28 +-- .../v1alpha1/credentialissuerconfig.go | 4 +- .../{crdpinniped => config}/v1alpha1/doc.go | 0 .../v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_config_client.go} | 8 +- .../fake/fake_credentialissuerconfig.go | 8 +- .../v1alpha1/generated_expansion.go | 0 .../{crdpinniped => config}/interface.go | 4 +- .../v1alpha1/credentialissuerconfig.go | 12 +- .../v1alpha1/interface.go | 0 .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 6 +- .../v1alpha1/credentialissuerconfig.go | 2 +- .../v1alpha1/expansion_generated.go | 0 .../client/openapi/zz_generated.openapi.go | 170 ++++++++--------- ...pinniped.dev_credentialissuerconfigs.yaml} | 4 +- generated/1.18/README.adoc | 30 +-- .../crdpinniped => 1.18/apis/config}/doc.go | 6 +- .../crdpinniped => 1.18/apis/config}/types.go | 2 +- .../v1alpha1/conversion.go | 0 .../v1alpha1/defaults.go | 0 .../apis/config}/v1alpha1/doc.go | 6 +- .../v1alpha1/register.go | 2 +- .../{crdpinniped => config}/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.conversion.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 .../v1alpha1/zz_generated.defaults.go | 0 .../apis/config}/zz_generated.deepcopy.go | 2 +- .../client/clientset/versioned/clientset.go | 18 +- .../versioned/fake/clientset_generated.go | 10 +- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../v1alpha1/config_client.go} | 28 +-- .../v1alpha1/credentialissuerconfig.go | 4 +- .../{crdpinniped => config}/v1alpha1/doc.go | 0 .../v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_config_client.go} | 8 +- .../fake/fake_credentialissuerconfig.go | 8 +- .../v1alpha1/generated_expansion.go | 0 .../{crdpinniped => config}/interface.go | 4 +- .../v1alpha1/credentialissuerconfig.go | 12 +- .../v1alpha1/interface.go | 0 .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 6 +- .../v1alpha1/credentialissuerconfig.go | 2 +- .../v1alpha1/expansion_generated.go | 0 .../client/openapi/zz_generated.openapi.go | 170 ++++++++--------- ....pinniped.dev_credentialissuerconfigs.yaml | 4 +- generated/1.19/README.adoc | 30 +-- .../crdpinniped => 1.19/apis/config}/doc.go | 6 +- .../crdpinniped => 1.19/apis/config}/types.go | 2 +- .../v1alpha1/conversion.go | 0 .../v1alpha1/defaults.go | 0 .../{crdpinniped => config}/v1alpha1/doc.go | 6 +- .../v1alpha1/register.go | 2 +- .../{crdpinniped => config}/v1alpha1/types.go | 0 .../v1alpha1/zz_generated.conversion.go | 0 .../v1alpha1/zz_generated.deepcopy.go | 0 .../v1alpha1/zz_generated.defaults.go | 0 .../apis/config}/zz_generated.deepcopy.go | 2 +- .../client/clientset/versioned/clientset.go | 18 +- .../versioned/fake/clientset_generated.go | 10 +- .../clientset/versioned/fake/register.go | 4 +- .../clientset/versioned/scheme/register.go | 4 +- .../v1alpha1/config_client.go} | 28 +-- .../v1alpha1/credentialissuerconfig.go | 4 +- .../{crdpinniped => config}/v1alpha1/doc.go | 0 .../v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_config_client.go} | 8 +- .../fake/fake_credentialissuerconfig.go | 8 +- .../v1alpha1/generated_expansion.go | 0 .../{crdpinniped => config}/interface.go | 4 +- .../v1alpha1/credentialissuerconfig.go | 12 +- .../v1alpha1/interface.go | 0 .../informers/externalversions/factory.go | 8 +- .../informers/externalversions/generic.go | 6 +- .../v1alpha1/credentialissuerconfig.go | 2 +- .../v1alpha1/expansion_generated.go | 0 .../client/openapi/zz_generated.openapi.go | 172 +++++++++--------- ...pinniped.dev_credentialissuerconfigs.yaml} | 4 +- hack/lib/docs/config.yaml | 2 +- hack/lib/update-codegen.sh | 8 +- ...eate_or_update_credential_issuer_config.go | 20 +- ...or_update_credential_issuer_config_test.go | 49 +++-- internal/controller/issuerconfig/publisher.go | 12 +- .../controller/issuerconfig/publisher_test.go | 28 +-- .../controllermanager/prepare_controllers.go | 2 +- internal/server/server.go | 22 +-- test/integration/api_discovery_test.go | 8 +- .../credentialissuerconfig_test.go | 26 +-- 117 files changed, 622 insertions(+), 623 deletions(-) rename apis/{crdpinniped => config}/doc.go.tmpl (51%) rename apis/{crdpinniped => config}/types.go.tmpl (84%) rename apis/{crdpinniped => config}/v1alpha1/conversion.go.tmpl (100%) rename apis/{crdpinniped => config}/v1alpha1/defaults.go.tmpl (100%) rename apis/{crdpinniped => config}/v1alpha1/doc.go.tmpl (54%) rename apis/{crdpinniped => config}/v1alpha1/register.go.tmpl (97%) rename apis/{crdpinniped => config}/v1alpha1/types.go.tmpl (100%) rename generated/1.17/crds/crd.pinniped.dev_credentialissuerconfigs.yaml => deploy/config.pinniped.dev_credentialissuerconfigs.yaml (97%) rename generated/{1.18/apis/crdpinniped => 1.17/apis/config}/doc.go (51%) rename generated/1.17/apis/{crdpinniped => config}/types.go (84%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/conversion.go (100%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/defaults.go (100%) rename generated/{1.18/apis/crdpinniped => 1.17/apis/config}/v1alpha1/doc.go (53%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/register.go (97%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/types.go (100%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/zz_generated.conversion.go (100%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/zz_generated.deepcopy.go (100%) rename generated/1.17/apis/{crdpinniped => config}/v1alpha1/zz_generated.defaults.go (100%) rename generated/{1.19/apis/crdpinniped => 1.17/apis/config}/zz_generated.deepcopy.go (90%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped/v1alpha1/crdpinniped_client.go => config/v1alpha1/config_client.go} (57%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (97%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/doc.go (100%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/doc.go (100%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go => config/v1alpha1/fake/fake_config_client.go} (69%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/fake_credentialissuerconfig.go (95%) rename generated/1.17/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/generated_expansion.go (100%) rename generated/1.17/client/informers/externalversions/{crdpinniped => config}/interface.go (95%) rename generated/1.17/client/informers/externalversions/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (86%) rename generated/1.17/client/informers/externalversions/{crdpinniped => config}/v1alpha1/interface.go (100%) rename generated/{1.18/client/listers/crdpinniped => 1.17/client/listers/config}/v1alpha1/credentialissuerconfig.go (97%) rename generated/1.17/client/listers/{crdpinniped => config}/v1alpha1/expansion_generated.go (100%) rename generated/{1.18/crds/crd.pinniped.dev_credentialissuerconfigs.yaml => 1.17/crds/config.pinniped.dev_credentialissuerconfigs.yaml} (97%) rename generated/{1.19/apis/crdpinniped => 1.18/apis/config}/doc.go (51%) rename generated/{1.19/apis/crdpinniped => 1.18/apis/config}/types.go (84%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/conversion.go (100%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/defaults.go (100%) rename generated/{1.17/apis/crdpinniped => 1.18/apis/config}/v1alpha1/doc.go (53%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/register.go (97%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/types.go (100%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/zz_generated.conversion.go (100%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/zz_generated.deepcopy.go (100%) rename generated/1.18/apis/{crdpinniped => config}/v1alpha1/zz_generated.defaults.go (100%) rename generated/{1.17/apis/crdpinniped => 1.18/apis/config}/zz_generated.deepcopy.go (90%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped/v1alpha1/crdpinniped_client.go => config/v1alpha1/config_client.go} (57%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (97%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/doc.go (100%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/doc.go (100%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go => config/v1alpha1/fake/fake_config_client.go} (69%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/fake_credentialissuerconfig.go (95%) rename generated/1.18/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/generated_expansion.go (100%) rename generated/1.18/client/informers/externalversions/{crdpinniped => config}/interface.go (95%) rename generated/1.18/client/informers/externalversions/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (85%) rename generated/1.18/client/informers/externalversions/{crdpinniped => config}/v1alpha1/interface.go (100%) rename generated/{1.17/client/listers/crdpinniped => 1.18/client/listers/config}/v1alpha1/credentialissuerconfig.go (97%) rename generated/1.18/client/listers/{crdpinniped => config}/v1alpha1/expansion_generated.go (100%) rename deploy/crd.pinniped.dev_credentialissuerconfigs.yaml => generated/1.18/crds/config.pinniped.dev_credentialissuerconfigs.yaml (97%) rename generated/{1.17/apis/crdpinniped => 1.19/apis/config}/doc.go (51%) rename generated/{1.18/apis/crdpinniped => 1.19/apis/config}/types.go (84%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/conversion.go (100%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/defaults.go (100%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/doc.go (53%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/register.go (97%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/types.go (100%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/zz_generated.conversion.go (100%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/zz_generated.deepcopy.go (100%) rename generated/1.19/apis/{crdpinniped => config}/v1alpha1/zz_generated.defaults.go (100%) rename generated/{1.18/apis/crdpinniped => 1.19/apis/config}/zz_generated.deepcopy.go (90%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped/v1alpha1/crdpinniped_client.go => config/v1alpha1/config_client.go} (57%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (97%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/doc.go (100%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/doc.go (100%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go => config/v1alpha1/fake/fake_config_client.go} (69%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/fake/fake_credentialissuerconfig.go (95%) rename generated/1.19/client/clientset/versioned/typed/{crdpinniped => config}/v1alpha1/generated_expansion.go (100%) rename generated/1.19/client/informers/externalversions/{crdpinniped => config}/interface.go (95%) rename generated/1.19/client/informers/externalversions/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (85%) rename generated/1.19/client/informers/externalversions/{crdpinniped => config}/v1alpha1/interface.go (100%) rename generated/1.19/client/listers/{crdpinniped => config}/v1alpha1/credentialissuerconfig.go (98%) rename generated/1.19/client/listers/{crdpinniped => config}/v1alpha1/expansion_generated.go (100%) rename generated/1.19/crds/{crd.pinniped.dev_credentialissuerconfigs.yaml => config.pinniped.dev_credentialissuerconfigs.yaml} (97%) diff --git a/apis/crdpinniped/doc.go.tmpl b/apis/config/doc.go.tmpl similarity index 51% rename from apis/crdpinniped/doc.go.tmpl rename to apis/config/doc.go.tmpl index f896e3cc..4e7aa82f 100644 --- a/apis/crdpinniped/doc.go.tmpl +++ b/apis/config/doc.go.tmpl @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package crdpinniped is the internal version of the Pinniped CRD-based API. -package crdpinniped +// Package config is the internal version of the Pinniped configuration API. +package config diff --git a/apis/crdpinniped/types.go.tmpl b/apis/config/types.go.tmpl similarity index 84% rename from apis/crdpinniped/types.go.tmpl rename to apis/config/types.go.tmpl index 0cabbe15..5a44b975 100644 --- a/apis/crdpinniped/types.go.tmpl +++ b/apis/config/types.go.tmpl @@ -1,4 +1,4 @@ // Copyright 2020 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package crdpinniped +package config diff --git a/apis/crdpinniped/v1alpha1/conversion.go.tmpl b/apis/config/v1alpha1/conversion.go.tmpl similarity index 100% rename from apis/crdpinniped/v1alpha1/conversion.go.tmpl rename to apis/config/v1alpha1/conversion.go.tmpl diff --git a/apis/crdpinniped/v1alpha1/defaults.go.tmpl b/apis/config/v1alpha1/defaults.go.tmpl similarity index 100% rename from apis/crdpinniped/v1alpha1/defaults.go.tmpl rename to apis/config/v1alpha1/defaults.go.tmpl diff --git a/apis/crdpinniped/v1alpha1/doc.go.tmpl b/apis/config/v1alpha1/doc.go.tmpl similarity index 54% rename from apis/crdpinniped/v1alpha1/doc.go.tmpl rename to apis/config/v1alpha1/doc.go.tmpl index 06f2080e..b0169499 100644 --- a/apis/crdpinniped/v1alpha1/doc.go.tmpl +++ b/apis/config/v1alpha1/doc.go.tmpl @@ -3,9 +3,9 @@ // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=go.pinniped.dev/GENERATED_PKG/apis/crdpinniped +// +k8s:conversion-gen=go.pinniped.dev/GENERATED_PKG/apis/config // +k8s:defaulter-gen=TypeMeta -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +// Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. package v1alpha1 diff --git a/apis/crdpinniped/v1alpha1/register.go.tmpl b/apis/config/v1alpha1/register.go.tmpl similarity index 97% rename from apis/crdpinniped/v1alpha1/register.go.tmpl rename to apis/config/v1alpha1/register.go.tmpl index fbc08a50..18936d7e 100644 --- a/apis/crdpinniped/v1alpha1/register.go.tmpl +++ b/apis/config/v1alpha1/register.go.tmpl @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -const GroupName = "crd.pinniped.dev" +const GroupName = "config.pinniped.dev" // SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/apis/crdpinniped/v1alpha1/types.go.tmpl b/apis/config/v1alpha1/types.go.tmpl similarity index 100% rename from apis/crdpinniped/v1alpha1/types.go.tmpl rename to apis/config/v1alpha1/types.go.tmpl diff --git a/cmd/pinniped/cmd/get_kubeconfig.go b/cmd/pinniped/cmd/get_kubeconfig.go index ba002ac4..f0054b15 100644 --- a/cmd/pinniped/cmd/get_kubeconfig.go +++ b/cmd/pinniped/cmd/get_kubeconfig.go @@ -22,7 +22,7 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" v1 "k8s.io/client-go/tools/clientcmd/api/v1" - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedclientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" "go.pinniped.dev/internal/constable" "go.pinniped.dev/internal/controller/issuerconfig" @@ -211,7 +211,7 @@ func getKubeConfig( return nil } -func issueWarningForNonMatchingServerOrCA(v1Cluster v1.Cluster, credentialIssuerConfig *v1alpha1.CredentialIssuerConfig, warningsWriter io.Writer) error { +func issueWarningForNonMatchingServerOrCA(v1Cluster v1.Cluster, credentialIssuerConfig *configv1alpha1.CredentialIssuerConfig, warningsWriter io.Writer) error { credentialIssuerConfigCA, err := base64.StdEncoding.DecodeString(credentialIssuerConfig.Status.KubeConfigInfo.CertificateAuthorityData) if err != nil { return err @@ -226,7 +226,7 @@ func issueWarningForNonMatchingServerOrCA(v1Cluster v1.Cluster, credentialIssuer return nil } -func fetchPinnipedCredentialIssuerConfig(clientConfig clientcmd.ClientConfig, kubeClientCreator func(restConfig *rest.Config) (pinnipedclientset.Interface, error), pinnipedInstallationNamespace string) (*v1alpha1.CredentialIssuerConfig, error) { +func fetchPinnipedCredentialIssuerConfig(clientConfig clientcmd.ClientConfig, kubeClientCreator func(restConfig *rest.Config) (pinnipedclientset.Interface, error), pinnipedInstallationNamespace string) (*configv1alpha1.CredentialIssuerConfig, error) { restConfig, err := clientConfig.ClientConfig() if err != nil { return nil, err @@ -239,7 +239,7 @@ func fetchPinnipedCredentialIssuerConfig(clientConfig clientcmd.ClientConfig, ku ctx, cancelFunc := context.WithTimeout(context.Background(), time.Second*20) defer cancelFunc() - credentialIssuerConfig, err := clientset.CrdV1alpha1().CredentialIssuerConfigs(pinnipedInstallationNamespace).Get(ctx, issuerconfig.ConfigName, metav1.GetOptions{}) + credentialIssuerConfig, err := clientset.ConfigV1alpha1().CredentialIssuerConfigs(pinnipedInstallationNamespace).Get(ctx, issuerconfig.ConfigName, metav1.GetOptions{}) if err != nil { if apierrors.IsNotFound(err) { return nil, constable.Error(fmt.Sprintf( diff --git a/cmd/pinniped/cmd/get_kubeconfig_test.go b/cmd/pinniped/cmd/get_kubeconfig_test.go index b4b3a6a6..08d38cd8 100644 --- a/cmd/pinniped/cmd/get_kubeconfig_test.go +++ b/cmd/pinniped/cmd/get_kubeconfig_test.go @@ -18,7 +18,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/rest" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedclientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" pinnipedfake "go.pinniped.dev/generated/1.19/client/clientset/versioned/fake" "go.pinniped.dev/internal/here" @@ -240,18 +240,18 @@ func expectedKubeconfigYAML(clusterCAData, clusterServer, command, token, pinnip `, clusterCAData, clusterServer, command, pinnipedEndpoint, pinnipedCABundle, namespace, token) } -func newCredentialIssuerConfig(server, certificateAuthorityData string) *crdpinnipedv1alpha1.CredentialIssuerConfig { - return &crdpinnipedv1alpha1.CredentialIssuerConfig{ +func newCredentialIssuerConfig(server, certificateAuthorityData string) *configv1alpha1.CredentialIssuerConfig { + return &configv1alpha1.CredentialIssuerConfig{ TypeMeta: metav1.TypeMeta{ Kind: "CredentialIssuerConfig", - APIVersion: crdpinnipedv1alpha1.SchemeGroupVersion.String(), + APIVersion: configv1alpha1.SchemeGroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: "pinniped-config", Namespace: "some-namespace", }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{ - KubeConfigInfo: &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + Status: configv1alpha1.CredentialIssuerConfigStatus{ + KubeConfigInfo: &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: server, CertificateAuthorityData: base64.StdEncoding.EncodeToString([]byte(certificateAuthorityData)), }, @@ -322,8 +322,8 @@ func TestGetKubeConfig(t *testing.T) { // update the Server and CertificateAuthorityData to make them match the other kubeconfig context r.NoError(pinnipedClient.Tracker().Update( schema.GroupVersionResource{ - Group: crdpinnipedv1alpha1.GroupName, - Version: crdpinnipedv1alpha1.SchemeGroupVersion.Version, + Group: configv1alpha1.GroupName, + Version: configv1alpha1.SchemeGroupVersion.Version, Resource: "credentialissuerconfigs", }, newCredentialIssuerConfig( @@ -567,16 +567,16 @@ func TestGetKubeConfig(t *testing.T) { when("the CredentialIssuerConfig is found on the cluster with an empty KubeConfigInfo", func() { it.Before(func() { r.NoError(pinnipedClient.Tracker().Add( - &crdpinnipedv1alpha1.CredentialIssuerConfig{ + &configv1alpha1.CredentialIssuerConfig{ TypeMeta: metav1.TypeMeta{ Kind: "CredentialIssuerConfig", - APIVersion: crdpinnipedv1alpha1.SchemeGroupVersion.String(), + APIVersion: configv1alpha1.SchemeGroupVersion.String(), }, ObjectMeta: metav1.ObjectMeta{ Name: "pinniped-config", Namespace: "some-namespace", }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{}, + Status: configv1alpha1.CredentialIssuerConfigStatus{}, }, )) }) diff --git a/generated/1.17/crds/crd.pinniped.dev_credentialissuerconfigs.yaml b/deploy/config.pinniped.dev_credentialissuerconfigs.yaml similarity index 97% rename from generated/1.17/crds/crd.pinniped.dev_credentialissuerconfigs.yaml rename to deploy/config.pinniped.dev_credentialissuerconfigs.yaml index e47f8e63..370df951 100644 --- a/generated/1.17/crds/crd.pinniped.dev_credentialissuerconfigs.yaml +++ b/deploy/config.pinniped.dev_credentialissuerconfigs.yaml @@ -6,9 +6,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.4.0 creationTimestamp: null - name: credentialissuerconfigs.crd.pinniped.dev + name: credentialissuerconfigs.config.pinniped.dev spec: - group: crd.pinniped.dev + group: config.pinniped.dev names: kind: CredentialIssuerConfig listKind: CredentialIssuerConfigList diff --git a/deploy/rbac.yaml b/deploy/rbac.yaml index 0600ff7f..db45e07c 100644 --- a/deploy/rbac.yaml +++ b/deploy/rbac.yaml @@ -47,7 +47,7 @@ rules: - apiGroups: [""] resources: [secrets] verbs: [create, get, list, patch, update, watch, delete] - - apiGroups: [crd.pinniped.dev, idp.pinniped.dev] + - apiGroups: [config.pinniped.dev, idp.pinniped.dev] resources: ["*"] verbs: [create, get, list, update, watch] --- diff --git a/generated/1.17/README.adoc b/generated/1.17/README.adoc index 91f150dc..5e298c80 100644 --- a/generated/1.17/README.adoc +++ b/generated/1.17/README.adoc @@ -5,27 +5,27 @@ == API Reference .Packages -- xref:{anchor_prefix}-crd-pinniped-dev-v1alpha1[$$crd.pinniped.dev/v1alpha1$$] +- xref:{anchor_prefix}-config-pinniped-dev-v1alpha1[$$config.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-idp-pinniped-dev-v1alpha1[$$idp.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-login-pinniped-dev-v1alpha1[$$login.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-pinniped-dev-v1alpha1[$$pinniped.dev/v1alpha1$$] -[id="{anchor_prefix}-crd-pinniped-dev-v1alpha1"] -=== crd.pinniped.dev/v1alpha1 +[id="{anchor_prefix}-config-pinniped-dev-v1alpha1"] +=== config.pinniped.dev/v1alpha1 -Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfig"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfig"] ==== CredentialIssuerConfig .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] **** [cols="25a,75a", options="header"] @@ -33,18 +33,18 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. | Field | Description | *`metadata`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.17/#objectmeta-v1-meta[$$ObjectMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`. -| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. +| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo"] ==== CredentialIssuerConfigKubeConfigInfo .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] @@ -57,32 +57,32 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstatus"] ==== CredentialIssuerConfigStatus Status of a credential issuer. .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] **** [cols="25a,75a", options="header"] |=== | Field | Description -| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. +| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. +| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstrategy"] ==== CredentialIssuerConfigStrategy .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-17-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] diff --git a/generated/1.18/apis/crdpinniped/doc.go b/generated/1.17/apis/config/doc.go similarity index 51% rename from generated/1.18/apis/crdpinniped/doc.go rename to generated/1.17/apis/config/doc.go index f896e3cc..4e7aa82f 100644 --- a/generated/1.18/apis/crdpinniped/doc.go +++ b/generated/1.17/apis/config/doc.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package crdpinniped is the internal version of the Pinniped CRD-based API. -package crdpinniped +// Package config is the internal version of the Pinniped configuration API. +package config diff --git a/generated/1.17/apis/crdpinniped/types.go b/generated/1.17/apis/config/types.go similarity index 84% rename from generated/1.17/apis/crdpinniped/types.go rename to generated/1.17/apis/config/types.go index 0cabbe15..5a44b975 100644 --- a/generated/1.17/apis/crdpinniped/types.go +++ b/generated/1.17/apis/config/types.go @@ -1,4 +1,4 @@ // Copyright 2020 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package crdpinniped +package config diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/conversion.go b/generated/1.17/apis/config/v1alpha1/conversion.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/conversion.go rename to generated/1.17/apis/config/v1alpha1/conversion.go diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/defaults.go b/generated/1.17/apis/config/v1alpha1/defaults.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/defaults.go rename to generated/1.17/apis/config/v1alpha1/defaults.go diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/doc.go b/generated/1.17/apis/config/v1alpha1/doc.go similarity index 53% rename from generated/1.18/apis/crdpinniped/v1alpha1/doc.go rename to generated/1.17/apis/config/v1alpha1/doc.go index ac02a8ba..f76687db 100644 --- a/generated/1.18/apis/crdpinniped/v1alpha1/doc.go +++ b/generated/1.17/apis/config/v1alpha1/doc.go @@ -3,9 +3,9 @@ // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=go.pinniped.dev/generated/1.18/apis/crdpinniped +// +k8s:conversion-gen=go.pinniped.dev/generated/1.17/apis/config // +k8s:defaulter-gen=TypeMeta -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +// Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. package v1alpha1 diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/register.go b/generated/1.17/apis/config/v1alpha1/register.go similarity index 97% rename from generated/1.17/apis/crdpinniped/v1alpha1/register.go rename to generated/1.17/apis/config/v1alpha1/register.go index fbc08a50..18936d7e 100644 --- a/generated/1.17/apis/crdpinniped/v1alpha1/register.go +++ b/generated/1.17/apis/config/v1alpha1/register.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -const GroupName = "crd.pinniped.dev" +const GroupName = "config.pinniped.dev" // SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/types.go b/generated/1.17/apis/config/v1alpha1/types.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/types.go rename to generated/1.17/apis/config/v1alpha1/types.go diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.conversion.go b/generated/1.17/apis/config/v1alpha1/zz_generated.conversion.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.conversion.go rename to generated/1.17/apis/config/v1alpha1/zz_generated.conversion.go diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go b/generated/1.17/apis/config/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go rename to generated/1.17/apis/config/v1alpha1/zz_generated.deepcopy.go diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.defaults.go b/generated/1.17/apis/config/v1alpha1/zz_generated.defaults.go similarity index 100% rename from generated/1.17/apis/crdpinniped/v1alpha1/zz_generated.defaults.go rename to generated/1.17/apis/config/v1alpha1/zz_generated.defaults.go diff --git a/generated/1.19/apis/crdpinniped/zz_generated.deepcopy.go b/generated/1.17/apis/config/zz_generated.deepcopy.go similarity index 90% rename from generated/1.19/apis/crdpinniped/zz_generated.deepcopy.go rename to generated/1.17/apis/config/zz_generated.deepcopy.go index 4c7831c5..eabadefc 100644 --- a/generated/1.19/apis/crdpinniped/zz_generated.deepcopy.go +++ b/generated/1.17/apis/config/zz_generated.deepcopy.go @@ -5,4 +5,4 @@ // Code generated by deepcopy-gen. DO NOT EDIT. -package crdpinniped +package config diff --git a/generated/1.17/client/clientset/versioned/clientset.go b/generated/1.17/client/clientset/versioned/clientset.go index 0459c02d..0ce2c889 100644 --- a/generated/1.17/client/clientset/versioned/clientset.go +++ b/generated/1.17/client/clientset/versioned/clientset.go @@ -8,7 +8,7 @@ package versioned import ( "fmt" - crdv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/pinniped/v1alpha1" @@ -19,7 +19,7 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface + ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface IDPV1alpha1() idpv1alpha1.IDPV1alpha1Interface LoginV1alpha1() loginv1alpha1.LoginV1alpha1Interface PinnipedV1alpha1() pinnipedv1alpha1.PinnipedV1alpha1Interface @@ -29,15 +29,15 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - crdV1alpha1 *crdv1alpha1.CrdV1alpha1Client + configV1alpha1 *configv1alpha1.ConfigV1alpha1Client iDPV1alpha1 *idpv1alpha1.IDPV1alpha1Client loginV1alpha1 *loginv1alpha1.LoginV1alpha1Client pinnipedV1alpha1 *pinnipedv1alpha1.PinnipedV1alpha1Client } -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return c.crdV1alpha1 +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return c.configV1alpha1 } // IDPV1alpha1 retrieves the IDPV1alpha1Client @@ -76,7 +76,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.crdV1alpha1, err = crdv1alpha1.NewForConfig(&configShallowCopy) + cs.configV1alpha1, err = configv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -104,7 +104,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.NewForConfigOrDie(c) + cs.configV1alpha1 = configv1alpha1.NewForConfigOrDie(c) cs.iDPV1alpha1 = idpv1alpha1.NewForConfigOrDie(c) cs.loginV1alpha1 = loginv1alpha1.NewForConfigOrDie(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.NewForConfigOrDie(c) @@ -116,7 +116,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.New(c) + cs.configV1alpha1 = configv1alpha1.New(c) cs.iDPV1alpha1 = idpv1alpha1.New(c) cs.loginV1alpha1 = loginv1alpha1.New(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.New(c) diff --git a/generated/1.17/client/clientset/versioned/fake/clientset_generated.go b/generated/1.17/client/clientset/versioned/fake/clientset_generated.go index 6af05b33..ec10ba26 100644 --- a/generated/1.17/client/clientset/versioned/fake/clientset_generated.go +++ b/generated/1.17/client/clientset/versioned/fake/clientset_generated.go @@ -7,8 +7,8 @@ package fake import ( clientset "go.pinniped.dev/generated/1.17/client/clientset/versioned" - crdv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1" - fakecrdv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake" + configv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/config/v1alpha1" + fakeconfigv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake" idpv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/idp/v1alpha1" fakeidpv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/idp/v1alpha1/fake" loginv1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/login/v1alpha1" @@ -69,9 +69,9 @@ func (c *Clientset) Tracker() testing.ObjectTracker { var _ clientset.Interface = &Clientset{} -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return &fakecrdv1alpha1.FakeCrdV1alpha1{Fake: &c.Fake} +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return &fakeconfigv1alpha1.FakeConfigV1alpha1{Fake: &c.Fake} } // IDPV1alpha1 retrieves the IDPV1alpha1Client diff --git a/generated/1.17/client/clientset/versioned/fake/register.go b/generated/1.17/client/clientset/versioned/fake/register.go index 9e8dbb31..8b5269cc 100644 --- a/generated/1.17/client/clientset/versioned/fake/register.go +++ b/generated/1.17/client/clientset/versioned/fake/register.go @@ -6,7 +6,7 @@ package fake import ( - crdv1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.17/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.17/client/clientset/versioned/scheme/register.go b/generated/1.17/client/clientset/versioned/scheme/register.go index 74d9372c..7ba56003 100644 --- a/generated/1.17/client/clientset/versioned/scheme/register.go +++ b/generated/1.17/client/clientset/versioned/scheme/register.go @@ -6,7 +6,7 @@ package scheme import ( - crdv1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.17/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/config_client.go similarity index 57% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/config_client.go index 4241b07d..09c08925 100644 --- a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go +++ b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/config_client.go @@ -6,27 +6,27 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" "go.pinniped.dev/generated/1.17/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type CrdV1alpha1Interface interface { +type ConfigV1alpha1Interface interface { RESTClient() rest.Interface CredentialIssuerConfigsGetter } -// CrdV1alpha1Client is used to interact with features provided by the crd.pinniped.dev group. -type CrdV1alpha1Client struct { +// ConfigV1alpha1Client is used to interact with features provided by the config.pinniped.dev group. +type ConfigV1alpha1Client struct { restClient rest.Interface } -func (c *CrdV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { +func (c *ConfigV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { return newCredentialIssuerConfigs(c, namespace) } -// NewForConfig creates a new CrdV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { +// NewForConfig creates a new ConfigV1alpha1Client for the given config. +func NewForConfig(c *rest.Config) (*ConfigV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -35,12 +35,12 @@ func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { if err != nil { return nil, err } - return &CrdV1alpha1Client{client}, nil + return &ConfigV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new CrdV1alpha1Client for the given config and +// NewForConfigOrDie creates a new ConfigV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ConfigV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -48,9 +48,9 @@ func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { return client } -// New creates a new CrdV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *CrdV1alpha1Client { - return &CrdV1alpha1Client{c} +// New creates a new ConfigV1alpha1Client for the given RESTClient. +func New(c rest.Interface) *ConfigV1alpha1Client { + return &ConfigV1alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { @@ -68,7 +68,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CrdV1alpha1Client) RESTClient() rest.Interface { +func (c *ConfigV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go similarity index 97% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go index 5122588b..e17177eb 100644 --- a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go @@ -8,7 +8,7 @@ package v1alpha1 import ( "time" - v1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" scheme "go.pinniped.dev/generated/1.17/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -43,7 +43,7 @@ type credentialIssuerConfigs struct { } // newCredentialIssuerConfigs returns a CredentialIssuerConfigs -func newCredentialIssuerConfigs(c *CrdV1alpha1Client, namespace string) *credentialIssuerConfigs { +func newCredentialIssuerConfigs(c *ConfigV1alpha1Client, namespace string) *credentialIssuerConfigs { return &credentialIssuerConfigs{ client: c.RESTClient(), ns: namespace, diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/doc.go similarity index 100% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/doc.go diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go similarity index 100% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go similarity index 69% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go index 08a1967c..38be6941 100644 --- a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go +++ b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go @@ -6,22 +6,22 @@ package fake import ( - v1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/client/clientset/versioned/typed/config/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeCrdV1alpha1 struct { +type FakeConfigV1alpha1 struct { *testing.Fake } -func (c *FakeCrdV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { +func (c *FakeConfigV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { return &FakeCredentialIssuerConfigs{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCrdV1alpha1) RESTClient() rest.Interface { +func (c *FakeConfigV1alpha1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go similarity index 95% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go index 857aed99..00499940 100644 --- a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go +++ b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go @@ -6,7 +6,7 @@ package fake import ( - v1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -17,13 +17,13 @@ import ( // FakeCredentialIssuerConfigs implements CredentialIssuerConfigInterface type FakeCredentialIssuerConfigs struct { - Fake *FakeCrdV1alpha1 + Fake *FakeConfigV1alpha1 ns string } -var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "crd.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} +var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "config.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} -var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "crd.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} +var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "config.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} // Get takes name of the credentialIssuerConfig, and returns the corresponding credentialIssuerConfig object, and an error if there is any. func (c *FakeCredentialIssuerConfigs) Get(name string, options v1.GetOptions) (result *v1alpha1.CredentialIssuerConfig, err error) { diff --git a/generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go b/generated/1.17/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go similarity index 100% rename from generated/1.17/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go rename to generated/1.17/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go diff --git a/generated/1.17/client/informers/externalversions/crdpinniped/interface.go b/generated/1.17/client/informers/externalversions/config/interface.go similarity index 95% rename from generated/1.17/client/informers/externalversions/crdpinniped/interface.go rename to generated/1.17/client/informers/externalversions/config/interface.go index d881d645..d7b27e71 100644 --- a/generated/1.17/client/informers/externalversions/crdpinniped/interface.go +++ b/generated/1.17/client/informers/externalversions/config/interface.go @@ -3,10 +3,10 @@ // Code generated by informer-gen. DO NOT EDIT. -package crdpinniped +package config import ( - v1alpha1 "go.pinniped.dev/generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/client/informers/externalversions/config/v1alpha1" internalinterfaces "go.pinniped.dev/generated/1.17/client/informers/externalversions/internalinterfaces" ) diff --git a/generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.17/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go similarity index 86% rename from generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.17/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go index 0f891ad8..678001c4 100644 --- a/generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.17/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go @@ -8,10 +8,10 @@ package v1alpha1 import ( time "time" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" versioned "go.pinniped.dev/generated/1.17/client/clientset/versioned" internalinterfaces "go.pinniped.dev/generated/1.17/client/informers/externalversions/internalinterfaces" - v1alpha1 "go.pinniped.dev/generated/1.17/client/listers/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/client/listers/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -48,16 +48,16 @@ func NewFilteredCredentialIssuerConfigInformer(client versioned.Interface, names if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).List(options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).Watch(options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).Watch(options) }, }, - &crdpinnipedv1alpha1.CredentialIssuerConfig{}, + &configv1alpha1.CredentialIssuerConfig{}, resyncPeriod, indexers, ) @@ -68,7 +68,7 @@ func (f *credentialIssuerConfigInformer) defaultInformer(client versioned.Interf } func (f *credentialIssuerConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&crdpinnipedv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) + return f.factory.InformerFor(&configv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) } func (f *credentialIssuerConfigInformer) Lister() v1alpha1.CredentialIssuerConfigLister { diff --git a/generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1/interface.go b/generated/1.17/client/informers/externalversions/config/v1alpha1/interface.go similarity index 100% rename from generated/1.17/client/informers/externalversions/crdpinniped/v1alpha1/interface.go rename to generated/1.17/client/informers/externalversions/config/v1alpha1/interface.go diff --git a/generated/1.17/client/informers/externalversions/factory.go b/generated/1.17/client/informers/externalversions/factory.go index 965a3c00..6690b98a 100644 --- a/generated/1.17/client/informers/externalversions/factory.go +++ b/generated/1.17/client/informers/externalversions/factory.go @@ -11,7 +11,7 @@ import ( time "time" versioned "go.pinniped.dev/generated/1.17/client/clientset/versioned" - crdpinniped "go.pinniped.dev/generated/1.17/client/informers/externalversions/crdpinniped" + config "go.pinniped.dev/generated/1.17/client/informers/externalversions/config" idp "go.pinniped.dev/generated/1.17/client/informers/externalversions/idp" internalinterfaces "go.pinniped.dev/generated/1.17/client/informers/externalversions/internalinterfaces" login "go.pinniped.dev/generated/1.17/client/informers/externalversions/login" @@ -162,14 +162,14 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Crd() crdpinniped.Interface + Config() config.Interface IDP() idp.Interface Login() login.Interface Pinniped() pinniped.Interface } -func (f *sharedInformerFactory) Crd() crdpinniped.Interface { - return crdpinniped.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Config() config.Interface { + return config.New(f, f.namespace, f.tweakListOptions) } func (f *sharedInformerFactory) IDP() idp.Interface { diff --git a/generated/1.17/client/informers/externalversions/generic.go b/generated/1.17/client/informers/externalversions/generic.go index 362f51e6..5d2f19e7 100644 --- a/generated/1.17/client/informers/externalversions/generic.go +++ b/generated/1.17/client/informers/externalversions/generic.go @@ -8,7 +8,7 @@ package externalversions import ( "fmt" - v1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.17/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1" @@ -42,9 +42,9 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=crd.pinniped.dev, Version=v1alpha1 + // Group=config.pinniped.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("credentialissuerconfigs"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Crd().V1alpha1().CredentialIssuerConfigs().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Config().V1alpha1().CredentialIssuerConfigs().Informer()}, nil // Group=idp.pinniped.dev, Version=v1alpha1 case idpv1alpha1.SchemeGroupVersion.WithResource("webhookidentityproviders"): diff --git a/generated/1.18/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.17/client/listers/config/v1alpha1/credentialissuerconfig.go similarity index 97% rename from generated/1.18/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.17/client/listers/config/v1alpha1/credentialissuerconfig.go index 38f17737..5f273a69 100644 --- a/generated/1.18/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.17/client/listers/config/v1alpha1/credentialissuerconfig.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.17/apis/config/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/generated/1.17/client/listers/crdpinniped/v1alpha1/expansion_generated.go b/generated/1.17/client/listers/config/v1alpha1/expansion_generated.go similarity index 100% rename from generated/1.17/client/listers/crdpinniped/v1alpha1/expansion_generated.go rename to generated/1.17/client/listers/config/v1alpha1/expansion_generated.go diff --git a/generated/1.17/client/openapi/zz_generated.openapi.go b/generated/1.17/client/openapi/zz_generated.openapi.go index f992b95f..4b5394a3 100644 --- a/generated/1.17/client/openapi/zz_generated.openapi.go +++ b/generated/1.17/client/openapi/zz_generated.openapi.go @@ -17,83 +17,83 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfig": schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref), - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigList": schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref), - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus": schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref), - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy": schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.Condition": schema_117_apis_idp_v1alpha1_Condition(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.TLSSpec": schema_117_apis_idp_v1alpha1_TLSSpec(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProvider": schema_117_apis_idp_v1alpha1_WebhookIdentityProvider(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), - "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), - "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.ClusterCredential": schema_117_apis_login_v1alpha1_ClusterCredential(ref), - "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequest": schema_117_apis_login_v1alpha1_TokenCredentialRequest(ref), - "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestList": schema_117_apis_login_v1alpha1_TokenCredentialRequestList(ref), - "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_117_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_117_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequest": schema_117_apis_pinniped_v1alpha1_CredentialRequest(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_117_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestList": schema_117_apis_pinniped_v1alpha1_CredentialRequestList(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_117_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_117_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_117_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfig": schema_117_apis_config_v1alpha1_CredentialIssuerConfig(ref), + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_117_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigList": schema_117_apis_config_v1alpha1_CredentialIssuerConfigList(ref), + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStatus": schema_117_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref), + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStrategy": schema_117_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.Condition": schema_117_apis_idp_v1alpha1_Condition(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.TLSSpec": schema_117_apis_idp_v1alpha1_TLSSpec(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProvider": schema_117_apis_idp_v1alpha1_WebhookIdentityProvider(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), + "go.pinniped.dev/generated/1.17/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_117_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), + "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.ClusterCredential": schema_117_apis_login_v1alpha1_ClusterCredential(ref), + "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequest": schema_117_apis_login_v1alpha1_TokenCredentialRequest(ref), + "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestList": schema_117_apis_login_v1alpha1_TokenCredentialRequestList(ref), + "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_117_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.17/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_117_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequest": schema_117_apis_pinniped_v1alpha1_CredentialRequest(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_117_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestList": schema_117_apis_pinniped_v1alpha1_CredentialRequestList(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_117_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_117_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.17/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_117_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), } } -func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_117_apis_config_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -121,7 +121,7 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe "status": { SchemaProps: spec.SchemaProps{ Description: "Status of the credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus"), + Ref: ref("go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStatus"), }, }, }, @@ -129,11 +129,11 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_117_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -161,7 +161,7 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(r } } -func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_117_apis_config_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -192,7 +192,7 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfig"), + Ref: ref("go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfig"), }, }, }, @@ -203,11 +203,11 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_117_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -221,7 +221,7 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"), + Ref: ref("go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStrategy"), }, }, }, @@ -230,7 +230,7 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo "kubeConfigInfo": { SchemaProps: spec.SchemaProps{ Description: "Information needed to form a valid Pinniped-based kubeconfig using this credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), + Ref: ref("go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), }, }, }, @@ -238,11 +238,11 @@ func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"}, + "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.17/apis/config/v1alpha1.CredentialIssuerConfigStrategy"}, } } -func schema_117_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_117_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/generated/1.18/crds/crd.pinniped.dev_credentialissuerconfigs.yaml b/generated/1.17/crds/config.pinniped.dev_credentialissuerconfigs.yaml similarity index 97% rename from generated/1.18/crds/crd.pinniped.dev_credentialissuerconfigs.yaml rename to generated/1.17/crds/config.pinniped.dev_credentialissuerconfigs.yaml index e47f8e63..370df951 100644 --- a/generated/1.18/crds/crd.pinniped.dev_credentialissuerconfigs.yaml +++ b/generated/1.17/crds/config.pinniped.dev_credentialissuerconfigs.yaml @@ -6,9 +6,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.4.0 creationTimestamp: null - name: credentialissuerconfigs.crd.pinniped.dev + name: credentialissuerconfigs.config.pinniped.dev spec: - group: crd.pinniped.dev + group: config.pinniped.dev names: kind: CredentialIssuerConfig listKind: CredentialIssuerConfigList diff --git a/generated/1.18/README.adoc b/generated/1.18/README.adoc index 133f8706..de274707 100644 --- a/generated/1.18/README.adoc +++ b/generated/1.18/README.adoc @@ -5,27 +5,27 @@ == API Reference .Packages -- xref:{anchor_prefix}-crd-pinniped-dev-v1alpha1[$$crd.pinniped.dev/v1alpha1$$] +- xref:{anchor_prefix}-config-pinniped-dev-v1alpha1[$$config.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-idp-pinniped-dev-v1alpha1[$$idp.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-login-pinniped-dev-v1alpha1[$$login.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-pinniped-dev-v1alpha1[$$pinniped.dev/v1alpha1$$] -[id="{anchor_prefix}-crd-pinniped-dev-v1alpha1"] -=== crd.pinniped.dev/v1alpha1 +[id="{anchor_prefix}-config-pinniped-dev-v1alpha1"] +=== config.pinniped.dev/v1alpha1 -Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfig"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfig"] ==== CredentialIssuerConfig .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] **** [cols="25a,75a", options="header"] @@ -33,18 +33,18 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. | Field | Description | *`metadata`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#objectmeta-v1-meta[$$ObjectMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`. -| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. +| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo"] ==== CredentialIssuerConfigKubeConfigInfo .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] @@ -57,32 +57,32 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstatus"] ==== CredentialIssuerConfigStatus Status of a credential issuer. .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] **** [cols="25a,75a", options="header"] |=== | Field | Description -| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. +| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. +| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstrategy"] ==== CredentialIssuerConfigStrategy .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-18-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] diff --git a/generated/1.19/apis/crdpinniped/doc.go b/generated/1.18/apis/config/doc.go similarity index 51% rename from generated/1.19/apis/crdpinniped/doc.go rename to generated/1.18/apis/config/doc.go index f896e3cc..4e7aa82f 100644 --- a/generated/1.19/apis/crdpinniped/doc.go +++ b/generated/1.18/apis/config/doc.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package crdpinniped is the internal version of the Pinniped CRD-based API. -package crdpinniped +// Package config is the internal version of the Pinniped configuration API. +package config diff --git a/generated/1.19/apis/crdpinniped/types.go b/generated/1.18/apis/config/types.go similarity index 84% rename from generated/1.19/apis/crdpinniped/types.go rename to generated/1.18/apis/config/types.go index 0cabbe15..5a44b975 100644 --- a/generated/1.19/apis/crdpinniped/types.go +++ b/generated/1.18/apis/config/types.go @@ -1,4 +1,4 @@ // Copyright 2020 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package crdpinniped +package config diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/conversion.go b/generated/1.18/apis/config/v1alpha1/conversion.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/conversion.go rename to generated/1.18/apis/config/v1alpha1/conversion.go diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/defaults.go b/generated/1.18/apis/config/v1alpha1/defaults.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/defaults.go rename to generated/1.18/apis/config/v1alpha1/defaults.go diff --git a/generated/1.17/apis/crdpinniped/v1alpha1/doc.go b/generated/1.18/apis/config/v1alpha1/doc.go similarity index 53% rename from generated/1.17/apis/crdpinniped/v1alpha1/doc.go rename to generated/1.18/apis/config/v1alpha1/doc.go index fca41e4e..5baa22d0 100644 --- a/generated/1.17/apis/crdpinniped/v1alpha1/doc.go +++ b/generated/1.18/apis/config/v1alpha1/doc.go @@ -3,9 +3,9 @@ // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=go.pinniped.dev/generated/1.17/apis/crdpinniped +// +k8s:conversion-gen=go.pinniped.dev/generated/1.18/apis/config // +k8s:defaulter-gen=TypeMeta -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +// Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. package v1alpha1 diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/register.go b/generated/1.18/apis/config/v1alpha1/register.go similarity index 97% rename from generated/1.18/apis/crdpinniped/v1alpha1/register.go rename to generated/1.18/apis/config/v1alpha1/register.go index fbc08a50..18936d7e 100644 --- a/generated/1.18/apis/crdpinniped/v1alpha1/register.go +++ b/generated/1.18/apis/config/v1alpha1/register.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -const GroupName = "crd.pinniped.dev" +const GroupName = "config.pinniped.dev" // SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/types.go b/generated/1.18/apis/config/v1alpha1/types.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/types.go rename to generated/1.18/apis/config/v1alpha1/types.go diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.conversion.go b/generated/1.18/apis/config/v1alpha1/zz_generated.conversion.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.conversion.go rename to generated/1.18/apis/config/v1alpha1/zz_generated.conversion.go diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go b/generated/1.18/apis/config/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go rename to generated/1.18/apis/config/v1alpha1/zz_generated.deepcopy.go diff --git a/generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.defaults.go b/generated/1.18/apis/config/v1alpha1/zz_generated.defaults.go similarity index 100% rename from generated/1.18/apis/crdpinniped/v1alpha1/zz_generated.defaults.go rename to generated/1.18/apis/config/v1alpha1/zz_generated.defaults.go diff --git a/generated/1.17/apis/crdpinniped/zz_generated.deepcopy.go b/generated/1.18/apis/config/zz_generated.deepcopy.go similarity index 90% rename from generated/1.17/apis/crdpinniped/zz_generated.deepcopy.go rename to generated/1.18/apis/config/zz_generated.deepcopy.go index 4c7831c5..eabadefc 100644 --- a/generated/1.17/apis/crdpinniped/zz_generated.deepcopy.go +++ b/generated/1.18/apis/config/zz_generated.deepcopy.go @@ -5,4 +5,4 @@ // Code generated by deepcopy-gen. DO NOT EDIT. -package crdpinniped +package config diff --git a/generated/1.18/client/clientset/versioned/clientset.go b/generated/1.18/client/clientset/versioned/clientset.go index bcc17d85..f660a259 100644 --- a/generated/1.18/client/clientset/versioned/clientset.go +++ b/generated/1.18/client/clientset/versioned/clientset.go @@ -8,7 +8,7 @@ package versioned import ( "fmt" - crdv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/pinniped/v1alpha1" @@ -19,7 +19,7 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface + ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface IDPV1alpha1() idpv1alpha1.IDPV1alpha1Interface LoginV1alpha1() loginv1alpha1.LoginV1alpha1Interface PinnipedV1alpha1() pinnipedv1alpha1.PinnipedV1alpha1Interface @@ -29,15 +29,15 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - crdV1alpha1 *crdv1alpha1.CrdV1alpha1Client + configV1alpha1 *configv1alpha1.ConfigV1alpha1Client iDPV1alpha1 *idpv1alpha1.IDPV1alpha1Client loginV1alpha1 *loginv1alpha1.LoginV1alpha1Client pinnipedV1alpha1 *pinnipedv1alpha1.PinnipedV1alpha1Client } -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return c.crdV1alpha1 +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return c.configV1alpha1 } // IDPV1alpha1 retrieves the IDPV1alpha1Client @@ -76,7 +76,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.crdV1alpha1, err = crdv1alpha1.NewForConfig(&configShallowCopy) + cs.configV1alpha1, err = configv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -104,7 +104,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.NewForConfigOrDie(c) + cs.configV1alpha1 = configv1alpha1.NewForConfigOrDie(c) cs.iDPV1alpha1 = idpv1alpha1.NewForConfigOrDie(c) cs.loginV1alpha1 = loginv1alpha1.NewForConfigOrDie(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.NewForConfigOrDie(c) @@ -116,7 +116,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.New(c) + cs.configV1alpha1 = configv1alpha1.New(c) cs.iDPV1alpha1 = idpv1alpha1.New(c) cs.loginV1alpha1 = loginv1alpha1.New(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.New(c) diff --git a/generated/1.18/client/clientset/versioned/fake/clientset_generated.go b/generated/1.18/client/clientset/versioned/fake/clientset_generated.go index f8e0aec7..44791acc 100644 --- a/generated/1.18/client/clientset/versioned/fake/clientset_generated.go +++ b/generated/1.18/client/clientset/versioned/fake/clientset_generated.go @@ -7,8 +7,8 @@ package fake import ( clientset "go.pinniped.dev/generated/1.18/client/clientset/versioned" - crdv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1" - fakecrdv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake" + configv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/config/v1alpha1" + fakeconfigv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake" idpv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/idp/v1alpha1" fakeidpv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/idp/v1alpha1/fake" loginv1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/login/v1alpha1" @@ -69,9 +69,9 @@ func (c *Clientset) Tracker() testing.ObjectTracker { var _ clientset.Interface = &Clientset{} -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return &fakecrdv1alpha1.FakeCrdV1alpha1{Fake: &c.Fake} +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return &fakeconfigv1alpha1.FakeConfigV1alpha1{Fake: &c.Fake} } // IDPV1alpha1 retrieves the IDPV1alpha1Client diff --git a/generated/1.18/client/clientset/versioned/fake/register.go b/generated/1.18/client/clientset/versioned/fake/register.go index 137a09d3..04aa23c0 100644 --- a/generated/1.18/client/clientset/versioned/fake/register.go +++ b/generated/1.18/client/clientset/versioned/fake/register.go @@ -6,7 +6,7 @@ package fake import ( - crdv1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.18/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.18/client/clientset/versioned/scheme/register.go b/generated/1.18/client/clientset/versioned/scheme/register.go index ca928cf6..52af8eaf 100644 --- a/generated/1.18/client/clientset/versioned/scheme/register.go +++ b/generated/1.18/client/clientset/versioned/scheme/register.go @@ -6,7 +6,7 @@ package scheme import ( - crdv1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.18/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/config_client.go similarity index 57% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/config_client.go index 78adcbf9..29650a3b 100644 --- a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go +++ b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/config_client.go @@ -6,27 +6,27 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" "go.pinniped.dev/generated/1.18/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type CrdV1alpha1Interface interface { +type ConfigV1alpha1Interface interface { RESTClient() rest.Interface CredentialIssuerConfigsGetter } -// CrdV1alpha1Client is used to interact with features provided by the crd.pinniped.dev group. -type CrdV1alpha1Client struct { +// ConfigV1alpha1Client is used to interact with features provided by the config.pinniped.dev group. +type ConfigV1alpha1Client struct { restClient rest.Interface } -func (c *CrdV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { +func (c *ConfigV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { return newCredentialIssuerConfigs(c, namespace) } -// NewForConfig creates a new CrdV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { +// NewForConfig creates a new ConfigV1alpha1Client for the given config. +func NewForConfig(c *rest.Config) (*ConfigV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -35,12 +35,12 @@ func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { if err != nil { return nil, err } - return &CrdV1alpha1Client{client}, nil + return &ConfigV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new CrdV1alpha1Client for the given config and +// NewForConfigOrDie creates a new ConfigV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ConfigV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -48,9 +48,9 @@ func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { return client } -// New creates a new CrdV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *CrdV1alpha1Client { - return &CrdV1alpha1Client{c} +// New creates a new ConfigV1alpha1Client for the given RESTClient. +func New(c rest.Interface) *ConfigV1alpha1Client { + return &ConfigV1alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { @@ -68,7 +68,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CrdV1alpha1Client) RESTClient() rest.Interface { +func (c *ConfigV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go similarity index 97% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go index b0158ede..326522ce 100644 --- a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go @@ -9,7 +9,7 @@ import ( "context" "time" - v1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" scheme "go.pinniped.dev/generated/1.18/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -44,7 +44,7 @@ type credentialIssuerConfigs struct { } // newCredentialIssuerConfigs returns a CredentialIssuerConfigs -func newCredentialIssuerConfigs(c *CrdV1alpha1Client, namespace string) *credentialIssuerConfigs { +func newCredentialIssuerConfigs(c *ConfigV1alpha1Client, namespace string) *credentialIssuerConfigs { return &credentialIssuerConfigs{ client: c.RESTClient(), ns: namespace, diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/doc.go similarity index 100% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/doc.go diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go similarity index 100% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go similarity index 69% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go index b98cad8b..665bfd36 100644 --- a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go +++ b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go @@ -6,22 +6,22 @@ package fake import ( - v1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/client/clientset/versioned/typed/config/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeCrdV1alpha1 struct { +type FakeConfigV1alpha1 struct { *testing.Fake } -func (c *FakeCrdV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { +func (c *FakeConfigV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { return &FakeCredentialIssuerConfigs{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCrdV1alpha1) RESTClient() rest.Interface { +func (c *FakeConfigV1alpha1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go similarity index 95% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go index dbfac97b..838975e0 100644 --- a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go +++ b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go @@ -8,7 +8,7 @@ package fake import ( "context" - v1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -19,13 +19,13 @@ import ( // FakeCredentialIssuerConfigs implements CredentialIssuerConfigInterface type FakeCredentialIssuerConfigs struct { - Fake *FakeCrdV1alpha1 + Fake *FakeConfigV1alpha1 ns string } -var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "crd.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} +var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "config.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} -var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "crd.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} +var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "config.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} // Get takes name of the credentialIssuerConfig, and returns the corresponding credentialIssuerConfig object, and an error if there is any. func (c *FakeCredentialIssuerConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.CredentialIssuerConfig, err error) { diff --git a/generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go b/generated/1.18/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go similarity index 100% rename from generated/1.18/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go rename to generated/1.18/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go diff --git a/generated/1.18/client/informers/externalversions/crdpinniped/interface.go b/generated/1.18/client/informers/externalversions/config/interface.go similarity index 95% rename from generated/1.18/client/informers/externalversions/crdpinniped/interface.go rename to generated/1.18/client/informers/externalversions/config/interface.go index 8c1645f8..887c0914 100644 --- a/generated/1.18/client/informers/externalversions/crdpinniped/interface.go +++ b/generated/1.18/client/informers/externalversions/config/interface.go @@ -3,10 +3,10 @@ // Code generated by informer-gen. DO NOT EDIT. -package crdpinniped +package config import ( - v1alpha1 "go.pinniped.dev/generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/client/informers/externalversions/config/v1alpha1" internalinterfaces "go.pinniped.dev/generated/1.18/client/informers/externalversions/internalinterfaces" ) diff --git a/generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.18/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go similarity index 85% rename from generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.18/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go index 9c4de908..96c6e375 100644 --- a/generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.18/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go @@ -9,10 +9,10 @@ import ( "context" time "time" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" versioned "go.pinniped.dev/generated/1.18/client/clientset/versioned" internalinterfaces "go.pinniped.dev/generated/1.18/client/informers/externalversions/internalinterfaces" - v1alpha1 "go.pinniped.dev/generated/1.18/client/listers/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/client/listers/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -49,16 +49,16 @@ func NewFilteredCredentialIssuerConfigInformer(client versioned.Interface, names if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).List(context.TODO(), options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).Watch(context.TODO(), options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).Watch(context.TODO(), options) }, }, - &crdpinnipedv1alpha1.CredentialIssuerConfig{}, + &configv1alpha1.CredentialIssuerConfig{}, resyncPeriod, indexers, ) @@ -69,7 +69,7 @@ func (f *credentialIssuerConfigInformer) defaultInformer(client versioned.Interf } func (f *credentialIssuerConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&crdpinnipedv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) + return f.factory.InformerFor(&configv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) } func (f *credentialIssuerConfigInformer) Lister() v1alpha1.CredentialIssuerConfigLister { diff --git a/generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1/interface.go b/generated/1.18/client/informers/externalversions/config/v1alpha1/interface.go similarity index 100% rename from generated/1.18/client/informers/externalversions/crdpinniped/v1alpha1/interface.go rename to generated/1.18/client/informers/externalversions/config/v1alpha1/interface.go diff --git a/generated/1.18/client/informers/externalversions/factory.go b/generated/1.18/client/informers/externalversions/factory.go index b15c659f..03b54691 100644 --- a/generated/1.18/client/informers/externalversions/factory.go +++ b/generated/1.18/client/informers/externalversions/factory.go @@ -11,7 +11,7 @@ import ( time "time" versioned "go.pinniped.dev/generated/1.18/client/clientset/versioned" - crdpinniped "go.pinniped.dev/generated/1.18/client/informers/externalversions/crdpinniped" + config "go.pinniped.dev/generated/1.18/client/informers/externalversions/config" idp "go.pinniped.dev/generated/1.18/client/informers/externalversions/idp" internalinterfaces "go.pinniped.dev/generated/1.18/client/informers/externalversions/internalinterfaces" login "go.pinniped.dev/generated/1.18/client/informers/externalversions/login" @@ -162,14 +162,14 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Crd() crdpinniped.Interface + Config() config.Interface IDP() idp.Interface Login() login.Interface Pinniped() pinniped.Interface } -func (f *sharedInformerFactory) Crd() crdpinniped.Interface { - return crdpinniped.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Config() config.Interface { + return config.New(f, f.namespace, f.tweakListOptions) } func (f *sharedInformerFactory) IDP() idp.Interface { diff --git a/generated/1.18/client/informers/externalversions/generic.go b/generated/1.18/client/informers/externalversions/generic.go index 8c79c6e6..711e2068 100644 --- a/generated/1.18/client/informers/externalversions/generic.go +++ b/generated/1.18/client/informers/externalversions/generic.go @@ -8,7 +8,7 @@ package externalversions import ( "fmt" - v1alpha1 "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.18/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1" @@ -42,9 +42,9 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=crd.pinniped.dev, Version=v1alpha1 + // Group=config.pinniped.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("credentialissuerconfigs"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Crd().V1alpha1().CredentialIssuerConfigs().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Config().V1alpha1().CredentialIssuerConfigs().Informer()}, nil // Group=idp.pinniped.dev, Version=v1alpha1 case idpv1alpha1.SchemeGroupVersion.WithResource("webhookidentityproviders"): diff --git a/generated/1.17/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.18/client/listers/config/v1alpha1/credentialissuerconfig.go similarity index 97% rename from generated/1.17/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.18/client/listers/config/v1alpha1/credentialissuerconfig.go index 6cabd8b3..5d8a5ec7 100644 --- a/generated/1.17/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.18/client/listers/config/v1alpha1/credentialissuerconfig.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.17/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.18/apis/config/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/generated/1.18/client/listers/crdpinniped/v1alpha1/expansion_generated.go b/generated/1.18/client/listers/config/v1alpha1/expansion_generated.go similarity index 100% rename from generated/1.18/client/listers/crdpinniped/v1alpha1/expansion_generated.go rename to generated/1.18/client/listers/config/v1alpha1/expansion_generated.go diff --git a/generated/1.18/client/openapi/zz_generated.openapi.go b/generated/1.18/client/openapi/zz_generated.openapi.go index ba59a11e..6e67eb5f 100644 --- a/generated/1.18/client/openapi/zz_generated.openapi.go +++ b/generated/1.18/client/openapi/zz_generated.openapi.go @@ -17,83 +17,83 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfig": schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref), - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigList": schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref), - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus": schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref), - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy": schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.Condition": schema_118_apis_idp_v1alpha1_Condition(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.TLSSpec": schema_118_apis_idp_v1alpha1_TLSSpec(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProvider": schema_118_apis_idp_v1alpha1_WebhookIdentityProvider(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), - "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), - "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.ClusterCredential": schema_118_apis_login_v1alpha1_ClusterCredential(ref), - "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequest": schema_118_apis_login_v1alpha1_TokenCredentialRequest(ref), - "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestList": schema_118_apis_login_v1alpha1_TokenCredentialRequestList(ref), - "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_118_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_118_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequest": schema_118_apis_pinniped_v1alpha1_CredentialRequest(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_118_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestList": schema_118_apis_pinniped_v1alpha1_CredentialRequestList(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_118_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_118_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_118_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfig": schema_118_apis_config_v1alpha1_CredentialIssuerConfig(ref), + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_118_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigList": schema_118_apis_config_v1alpha1_CredentialIssuerConfigList(ref), + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStatus": schema_118_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref), + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStrategy": schema_118_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.Condition": schema_118_apis_idp_v1alpha1_Condition(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.TLSSpec": schema_118_apis_idp_v1alpha1_TLSSpec(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProvider": schema_118_apis_idp_v1alpha1_WebhookIdentityProvider(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), + "go.pinniped.dev/generated/1.18/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_118_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), + "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.ClusterCredential": schema_118_apis_login_v1alpha1_ClusterCredential(ref), + "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequest": schema_118_apis_login_v1alpha1_TokenCredentialRequest(ref), + "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestList": schema_118_apis_login_v1alpha1_TokenCredentialRequestList(ref), + "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_118_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.18/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_118_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequest": schema_118_apis_pinniped_v1alpha1_CredentialRequest(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_118_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestList": schema_118_apis_pinniped_v1alpha1_CredentialRequestList(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_118_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_118_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.18/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_118_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), } } -func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_118_apis_config_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -121,7 +121,7 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe "status": { SchemaProps: spec.SchemaProps{ Description: "Status of the credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus"), + Ref: ref("go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStatus"), }, }, }, @@ -129,11 +129,11 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_118_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -161,7 +161,7 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(r } } -func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_118_apis_config_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -192,7 +192,7 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfig"), + Ref: ref("go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfig"), }, }, }, @@ -203,11 +203,11 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_118_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -221,7 +221,7 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"), + Ref: ref("go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStrategy"), }, }, }, @@ -230,7 +230,7 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo "kubeConfigInfo": { SchemaProps: spec.SchemaProps{ Description: "Information needed to form a valid Pinniped-based kubeconfig using this credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), + Ref: ref("go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), }, }, }, @@ -238,11 +238,11 @@ func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.18/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"}, + "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.18/apis/config/v1alpha1.CredentialIssuerConfigStrategy"}, } } -func schema_118_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_118_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/deploy/crd.pinniped.dev_credentialissuerconfigs.yaml b/generated/1.18/crds/config.pinniped.dev_credentialissuerconfigs.yaml similarity index 97% rename from deploy/crd.pinniped.dev_credentialissuerconfigs.yaml rename to generated/1.18/crds/config.pinniped.dev_credentialissuerconfigs.yaml index e47f8e63..370df951 100644 --- a/deploy/crd.pinniped.dev_credentialissuerconfigs.yaml +++ b/generated/1.18/crds/config.pinniped.dev_credentialissuerconfigs.yaml @@ -6,9 +6,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.4.0 creationTimestamp: null - name: credentialissuerconfigs.crd.pinniped.dev + name: credentialissuerconfigs.config.pinniped.dev spec: - group: crd.pinniped.dev + group: config.pinniped.dev names: kind: CredentialIssuerConfig listKind: CredentialIssuerConfigList diff --git a/generated/1.19/README.adoc b/generated/1.19/README.adoc index 7bfcb4d0..5e709d46 100644 --- a/generated/1.19/README.adoc +++ b/generated/1.19/README.adoc @@ -5,27 +5,27 @@ == API Reference .Packages -- xref:{anchor_prefix}-crd-pinniped-dev-v1alpha1[$$crd.pinniped.dev/v1alpha1$$] +- xref:{anchor_prefix}-config-pinniped-dev-v1alpha1[$$config.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-idp-pinniped-dev-v1alpha1[$$idp.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-login-pinniped-dev-v1alpha1[$$login.pinniped.dev/v1alpha1$$] - xref:{anchor_prefix}-pinniped-dev-v1alpha1[$$pinniped.dev/v1alpha1$$] -[id="{anchor_prefix}-crd-pinniped-dev-v1alpha1"] -=== crd.pinniped.dev/v1alpha1 +[id="{anchor_prefix}-config-pinniped-dev-v1alpha1"] +=== config.pinniped.dev/v1alpha1 -Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfig"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfig"] ==== CredentialIssuerConfig .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfiglist[$$CredentialIssuerConfigList$$] **** [cols="25a,75a", options="header"] @@ -33,18 +33,18 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. | Field | Description | *`metadata`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#objectmeta-v1-meta[$$ObjectMeta$$]__ | Refer to Kubernetes API documentation for fields of `metadata`. -| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. +| *`status`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$]__ | Status of the credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo"] ==== CredentialIssuerConfigKubeConfigInfo .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] @@ -57,32 +57,32 @@ Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. -[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstatus"] ==== CredentialIssuerConfigStatus Status of a credential issuer. .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfig[$$CredentialIssuerConfig$$] **** [cols="25a,75a", options="header"] |=== | Field | Description -| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. -| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. +| *`strategies`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstrategy[$$CredentialIssuerConfigStrategy$$] array__ | List of integration strategies that were attempted by Pinniped. +| *`kubeConfigInfo`* __xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigkubeconfiginfo[$$CredentialIssuerConfigKubeConfigInfo$$]__ | Information needed to form a valid Pinniped-based kubeconfig using this credential issuer. |=== -[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstrategy"] +[id="{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstrategy"] ==== CredentialIssuerConfigStrategy .Appears In: **** -- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-crdpinniped-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] +- xref:{anchor_prefix}-go-pinniped-dev-generated-1-19-apis-config-v1alpha1-credentialissuerconfigstatus[$$CredentialIssuerConfigStatus$$] **** [cols="25a,75a", options="header"] diff --git a/generated/1.17/apis/crdpinniped/doc.go b/generated/1.19/apis/config/doc.go similarity index 51% rename from generated/1.17/apis/crdpinniped/doc.go rename to generated/1.19/apis/config/doc.go index f896e3cc..4e7aa82f 100644 --- a/generated/1.17/apis/crdpinniped/doc.go +++ b/generated/1.19/apis/config/doc.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package crdpinniped is the internal version of the Pinniped CRD-based API. -package crdpinniped +// Package config is the internal version of the Pinniped configuration API. +package config diff --git a/generated/1.18/apis/crdpinniped/types.go b/generated/1.19/apis/config/types.go similarity index 84% rename from generated/1.18/apis/crdpinniped/types.go rename to generated/1.19/apis/config/types.go index 0cabbe15..5a44b975 100644 --- a/generated/1.18/apis/crdpinniped/types.go +++ b/generated/1.19/apis/config/types.go @@ -1,4 +1,4 @@ // Copyright 2020 the Pinniped contributors. All Rights Reserved. // SPDX-License-Identifier: Apache-2.0 -package crdpinniped +package config diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/conversion.go b/generated/1.19/apis/config/v1alpha1/conversion.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/conversion.go rename to generated/1.19/apis/config/v1alpha1/conversion.go diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/defaults.go b/generated/1.19/apis/config/v1alpha1/defaults.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/defaults.go rename to generated/1.19/apis/config/v1alpha1/defaults.go diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/doc.go b/generated/1.19/apis/config/v1alpha1/doc.go similarity index 53% rename from generated/1.19/apis/crdpinniped/v1alpha1/doc.go rename to generated/1.19/apis/config/v1alpha1/doc.go index 1fcb01d3..dd783577 100644 --- a/generated/1.19/apis/crdpinniped/v1alpha1/doc.go +++ b/generated/1.19/apis/config/v1alpha1/doc.go @@ -3,9 +3,9 @@ // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=go.pinniped.dev/generated/1.19/apis/crdpinniped +// +k8s:conversion-gen=go.pinniped.dev/generated/1.19/apis/config // +k8s:defaulter-gen=TypeMeta -// +groupName=crd.pinniped.dev +// +groupName=config.pinniped.dev -// Package v1alpha1 is the v1alpha1 version of the Pinniped CRD-based API. +// Package v1alpha1 is the v1alpha1 version of the Pinniped configuration API. package v1alpha1 diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/register.go b/generated/1.19/apis/config/v1alpha1/register.go similarity index 97% rename from generated/1.19/apis/crdpinniped/v1alpha1/register.go rename to generated/1.19/apis/config/v1alpha1/register.go index fbc08a50..18936d7e 100644 --- a/generated/1.19/apis/crdpinniped/v1alpha1/register.go +++ b/generated/1.19/apis/config/v1alpha1/register.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" ) -const GroupName = "crd.pinniped.dev" +const GroupName = "config.pinniped.dev" // SchemeGroupVersion is group version used to register these objects. var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/types.go b/generated/1.19/apis/config/v1alpha1/types.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/types.go rename to generated/1.19/apis/config/v1alpha1/types.go diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.conversion.go b/generated/1.19/apis/config/v1alpha1/zz_generated.conversion.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.conversion.go rename to generated/1.19/apis/config/v1alpha1/zz_generated.conversion.go diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go b/generated/1.19/apis/config/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.deepcopy.go rename to generated/1.19/apis/config/v1alpha1/zz_generated.deepcopy.go diff --git a/generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.defaults.go b/generated/1.19/apis/config/v1alpha1/zz_generated.defaults.go similarity index 100% rename from generated/1.19/apis/crdpinniped/v1alpha1/zz_generated.defaults.go rename to generated/1.19/apis/config/v1alpha1/zz_generated.defaults.go diff --git a/generated/1.18/apis/crdpinniped/zz_generated.deepcopy.go b/generated/1.19/apis/config/zz_generated.deepcopy.go similarity index 90% rename from generated/1.18/apis/crdpinniped/zz_generated.deepcopy.go rename to generated/1.19/apis/config/zz_generated.deepcopy.go index 4c7831c5..eabadefc 100644 --- a/generated/1.18/apis/crdpinniped/zz_generated.deepcopy.go +++ b/generated/1.19/apis/config/zz_generated.deepcopy.go @@ -5,4 +5,4 @@ // Code generated by deepcopy-gen. DO NOT EDIT. -package crdpinniped +package config diff --git a/generated/1.19/client/clientset/versioned/clientset.go b/generated/1.19/client/clientset/versioned/clientset.go index f1d03144..2f04361d 100644 --- a/generated/1.19/client/clientset/versioned/clientset.go +++ b/generated/1.19/client/clientset/versioned/clientset.go @@ -8,7 +8,7 @@ package versioned import ( "fmt" - crdv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/pinniped/v1alpha1" @@ -19,7 +19,7 @@ import ( type Interface interface { Discovery() discovery.DiscoveryInterface - CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface + ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface IDPV1alpha1() idpv1alpha1.IDPV1alpha1Interface LoginV1alpha1() loginv1alpha1.LoginV1alpha1Interface PinnipedV1alpha1() pinnipedv1alpha1.PinnipedV1alpha1Interface @@ -29,15 +29,15 @@ type Interface interface { // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - crdV1alpha1 *crdv1alpha1.CrdV1alpha1Client + configV1alpha1 *configv1alpha1.ConfigV1alpha1Client iDPV1alpha1 *idpv1alpha1.IDPV1alpha1Client loginV1alpha1 *loginv1alpha1.LoginV1alpha1Client pinnipedV1alpha1 *pinnipedv1alpha1.PinnipedV1alpha1Client } -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return c.crdV1alpha1 +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return c.configV1alpha1 } // IDPV1alpha1 retrieves the IDPV1alpha1Client @@ -76,7 +76,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.crdV1alpha1, err = crdv1alpha1.NewForConfig(&configShallowCopy) + cs.configV1alpha1, err = configv1alpha1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -104,7 +104,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.NewForConfigOrDie(c) + cs.configV1alpha1 = configv1alpha1.NewForConfigOrDie(c) cs.iDPV1alpha1 = idpv1alpha1.NewForConfigOrDie(c) cs.loginV1alpha1 = loginv1alpha1.NewForConfigOrDie(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.NewForConfigOrDie(c) @@ -116,7 +116,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.crdV1alpha1 = crdv1alpha1.New(c) + cs.configV1alpha1 = configv1alpha1.New(c) cs.iDPV1alpha1 = idpv1alpha1.New(c) cs.loginV1alpha1 = loginv1alpha1.New(c) cs.pinnipedV1alpha1 = pinnipedv1alpha1.New(c) diff --git a/generated/1.19/client/clientset/versioned/fake/clientset_generated.go b/generated/1.19/client/clientset/versioned/fake/clientset_generated.go index c9117629..71ade6ca 100644 --- a/generated/1.19/client/clientset/versioned/fake/clientset_generated.go +++ b/generated/1.19/client/clientset/versioned/fake/clientset_generated.go @@ -7,8 +7,8 @@ package fake import ( clientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" - crdv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1" - fakecrdv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake" + configv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/config/v1alpha1" + fakeconfigv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake" idpv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/idp/v1alpha1" fakeidpv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/idp/v1alpha1/fake" loginv1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/login/v1alpha1" @@ -69,9 +69,9 @@ func (c *Clientset) Tracker() testing.ObjectTracker { var _ clientset.Interface = &Clientset{} -// CrdV1alpha1 retrieves the CrdV1alpha1Client -func (c *Clientset) CrdV1alpha1() crdv1alpha1.CrdV1alpha1Interface { - return &fakecrdv1alpha1.FakeCrdV1alpha1{Fake: &c.Fake} +// ConfigV1alpha1 retrieves the ConfigV1alpha1Client +func (c *Clientset) ConfigV1alpha1() configv1alpha1.ConfigV1alpha1Interface { + return &fakeconfigv1alpha1.FakeConfigV1alpha1{Fake: &c.Fake} } // IDPV1alpha1 retrieves the IDPV1alpha1Client diff --git a/generated/1.19/client/clientset/versioned/fake/register.go b/generated/1.19/client/clientset/versioned/fake/register.go index e3af9301..5be4d655 100644 --- a/generated/1.19/client/clientset/versioned/fake/register.go +++ b/generated/1.19/client/clientset/versioned/fake/register.go @@ -6,7 +6,7 @@ package fake import ( - crdv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.19/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.19/client/clientset/versioned/scheme/register.go b/generated/1.19/client/clientset/versioned/scheme/register.go index a989227b..47d2cf16 100644 --- a/generated/1.19/client/clientset/versioned/scheme/register.go +++ b/generated/1.19/client/clientset/versioned/scheme/register.go @@ -6,7 +6,7 @@ package scheme import ( - crdv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.19/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1" @@ -21,7 +21,7 @@ var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) var localSchemeBuilder = runtime.SchemeBuilder{ - crdv1alpha1.AddToScheme, + configv1alpha1.AddToScheme, idpv1alpha1.AddToScheme, loginv1alpha1.AddToScheme, pinnipedv1alpha1.AddToScheme, diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/config_client.go similarity index 57% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/config_client.go index 92fc715a..04fa22e5 100644 --- a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/crdpinniped_client.go +++ b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/config_client.go @@ -6,27 +6,27 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" "go.pinniped.dev/generated/1.19/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) -type CrdV1alpha1Interface interface { +type ConfigV1alpha1Interface interface { RESTClient() rest.Interface CredentialIssuerConfigsGetter } -// CrdV1alpha1Client is used to interact with features provided by the crd.pinniped.dev group. -type CrdV1alpha1Client struct { +// ConfigV1alpha1Client is used to interact with features provided by the config.pinniped.dev group. +type ConfigV1alpha1Client struct { restClient rest.Interface } -func (c *CrdV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { +func (c *ConfigV1alpha1Client) CredentialIssuerConfigs(namespace string) CredentialIssuerConfigInterface { return newCredentialIssuerConfigs(c, namespace) } -// NewForConfig creates a new CrdV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { +// NewForConfig creates a new ConfigV1alpha1Client for the given config. +func NewForConfig(c *rest.Config) (*ConfigV1alpha1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -35,12 +35,12 @@ func NewForConfig(c *rest.Config) (*CrdV1alpha1Client, error) { if err != nil { return nil, err } - return &CrdV1alpha1Client{client}, nil + return &ConfigV1alpha1Client{client}, nil } -// NewForConfigOrDie creates a new CrdV1alpha1Client for the given config and +// NewForConfigOrDie creates a new ConfigV1alpha1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ConfigV1alpha1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -48,9 +48,9 @@ func NewForConfigOrDie(c *rest.Config) *CrdV1alpha1Client { return client } -// New creates a new CrdV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *CrdV1alpha1Client { - return &CrdV1alpha1Client{c} +// New creates a new ConfigV1alpha1Client for the given RESTClient. +func New(c rest.Interface) *ConfigV1alpha1Client { + return &ConfigV1alpha1Client{c} } func setConfigDefaults(config *rest.Config) error { @@ -68,7 +68,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *CrdV1alpha1Client) RESTClient() rest.Interface { +func (c *ConfigV1alpha1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go similarity index 97% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go index d38f40b3..1c42ec4c 100644 --- a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/credentialissuerconfig.go @@ -9,7 +9,7 @@ import ( "context" "time" - v1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" scheme "go.pinniped.dev/generated/1.19/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -44,7 +44,7 @@ type credentialIssuerConfigs struct { } // newCredentialIssuerConfigs returns a CredentialIssuerConfigs -func newCredentialIssuerConfigs(c *CrdV1alpha1Client, namespace string) *credentialIssuerConfigs { +func newCredentialIssuerConfigs(c *ConfigV1alpha1Client, namespace string) *credentialIssuerConfigs { return &credentialIssuerConfigs{ client: c.RESTClient(), ns: namespace, diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/doc.go similarity index 100% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/doc.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/doc.go diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go similarity index 100% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/doc.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/doc.go diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go similarity index 69% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go index c2cf95a8..5c1235c5 100644 --- a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_crdpinniped_client.go +++ b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_config_client.go @@ -6,22 +6,22 @@ package fake import ( - v1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/client/clientset/versioned/typed/config/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) -type FakeCrdV1alpha1 struct { +type FakeConfigV1alpha1 struct { *testing.Fake } -func (c *FakeCrdV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { +func (c *FakeConfigV1alpha1) CredentialIssuerConfigs(namespace string) v1alpha1.CredentialIssuerConfigInterface { return &FakeCredentialIssuerConfigs{c, namespace} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeCrdV1alpha1) RESTClient() rest.Interface { +func (c *FakeConfigV1alpha1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go similarity index 95% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go index 005563d3..8921f050 100644 --- a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/fake/fake_credentialissuerconfig.go +++ b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/fake/fake_credentialissuerconfig.go @@ -8,7 +8,7 @@ package fake import ( "context" - v1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -19,13 +19,13 @@ import ( // FakeCredentialIssuerConfigs implements CredentialIssuerConfigInterface type FakeCredentialIssuerConfigs struct { - Fake *FakeCrdV1alpha1 + Fake *FakeConfigV1alpha1 ns string } -var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "crd.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} +var credentialissuerconfigsResource = schema.GroupVersionResource{Group: "config.pinniped.dev", Version: "v1alpha1", Resource: "credentialissuerconfigs"} -var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "crd.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} +var credentialissuerconfigsKind = schema.GroupVersionKind{Group: "config.pinniped.dev", Version: "v1alpha1", Kind: "CredentialIssuerConfig"} // Get takes name of the credentialIssuerConfig, and returns the corresponding credentialIssuerConfig object, and an error if there is any. func (c *FakeCredentialIssuerConfigs) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.CredentialIssuerConfig, err error) { diff --git a/generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go b/generated/1.19/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go similarity index 100% rename from generated/1.19/client/clientset/versioned/typed/crdpinniped/v1alpha1/generated_expansion.go rename to generated/1.19/client/clientset/versioned/typed/config/v1alpha1/generated_expansion.go diff --git a/generated/1.19/client/informers/externalversions/crdpinniped/interface.go b/generated/1.19/client/informers/externalversions/config/interface.go similarity index 95% rename from generated/1.19/client/informers/externalversions/crdpinniped/interface.go rename to generated/1.19/client/informers/externalversions/config/interface.go index 5deeb298..d9393a7f 100644 --- a/generated/1.19/client/informers/externalversions/crdpinniped/interface.go +++ b/generated/1.19/client/informers/externalversions/config/interface.go @@ -3,10 +3,10 @@ // Code generated by informer-gen. DO NOT EDIT. -package crdpinniped +package config import ( - v1alpha1 "go.pinniped.dev/generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/client/informers/externalversions/config/v1alpha1" internalinterfaces "go.pinniped.dev/generated/1.19/client/informers/externalversions/internalinterfaces" ) diff --git a/generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.19/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go similarity index 85% rename from generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.19/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go index 17f69156..8376021b 100644 --- a/generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.19/client/informers/externalversions/config/v1alpha1/credentialissuerconfig.go @@ -9,10 +9,10 @@ import ( "context" time "time" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" versioned "go.pinniped.dev/generated/1.19/client/clientset/versioned" internalinterfaces "go.pinniped.dev/generated/1.19/client/informers/externalversions/internalinterfaces" - v1alpha1 "go.pinniped.dev/generated/1.19/client/listers/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/client/listers/config/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -49,16 +49,16 @@ func NewFilteredCredentialIssuerConfigInformer(client versioned.Interface, names if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).List(context.TODO(), options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).List(context.TODO(), options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { if tweakListOptions != nil { tweakListOptions(&options) } - return client.CrdV1alpha1().CredentialIssuerConfigs(namespace).Watch(context.TODO(), options) + return client.ConfigV1alpha1().CredentialIssuerConfigs(namespace).Watch(context.TODO(), options) }, }, - &crdpinnipedv1alpha1.CredentialIssuerConfig{}, + &configv1alpha1.CredentialIssuerConfig{}, resyncPeriod, indexers, ) @@ -69,7 +69,7 @@ func (f *credentialIssuerConfigInformer) defaultInformer(client versioned.Interf } func (f *credentialIssuerConfigInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&crdpinnipedv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) + return f.factory.InformerFor(&configv1alpha1.CredentialIssuerConfig{}, f.defaultInformer) } func (f *credentialIssuerConfigInformer) Lister() v1alpha1.CredentialIssuerConfigLister { diff --git a/generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1/interface.go b/generated/1.19/client/informers/externalversions/config/v1alpha1/interface.go similarity index 100% rename from generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1/interface.go rename to generated/1.19/client/informers/externalversions/config/v1alpha1/interface.go diff --git a/generated/1.19/client/informers/externalversions/factory.go b/generated/1.19/client/informers/externalversions/factory.go index 6e72dcbb..d98a4b7f 100644 --- a/generated/1.19/client/informers/externalversions/factory.go +++ b/generated/1.19/client/informers/externalversions/factory.go @@ -11,7 +11,7 @@ import ( time "time" versioned "go.pinniped.dev/generated/1.19/client/clientset/versioned" - crdpinniped "go.pinniped.dev/generated/1.19/client/informers/externalversions/crdpinniped" + config "go.pinniped.dev/generated/1.19/client/informers/externalversions/config" idp "go.pinniped.dev/generated/1.19/client/informers/externalversions/idp" internalinterfaces "go.pinniped.dev/generated/1.19/client/informers/externalversions/internalinterfaces" login "go.pinniped.dev/generated/1.19/client/informers/externalversions/login" @@ -162,14 +162,14 @@ type SharedInformerFactory interface { ForResource(resource schema.GroupVersionResource) (GenericInformer, error) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool - Crd() crdpinniped.Interface + Config() config.Interface IDP() idp.Interface Login() login.Interface Pinniped() pinniped.Interface } -func (f *sharedInformerFactory) Crd() crdpinniped.Interface { - return crdpinniped.New(f, f.namespace, f.tweakListOptions) +func (f *sharedInformerFactory) Config() config.Interface { + return config.New(f, f.namespace, f.tweakListOptions) } func (f *sharedInformerFactory) IDP() idp.Interface { diff --git a/generated/1.19/client/informers/externalversions/generic.go b/generated/1.19/client/informers/externalversions/generic.go index 0e288a18..13224b2d 100644 --- a/generated/1.19/client/informers/externalversions/generic.go +++ b/generated/1.19/client/informers/externalversions/generic.go @@ -8,7 +8,7 @@ package externalversions import ( "fmt" - v1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" idpv1alpha1 "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1" loginv1alpha1 "go.pinniped.dev/generated/1.19/apis/login/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1" @@ -42,9 +42,9 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=crd.pinniped.dev, Version=v1alpha1 + // Group=config.pinniped.dev, Version=v1alpha1 case v1alpha1.SchemeGroupVersion.WithResource("credentialissuerconfigs"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Crd().V1alpha1().CredentialIssuerConfigs().Informer()}, nil + return &genericInformer{resource: resource.GroupResource(), informer: f.Config().V1alpha1().CredentialIssuerConfigs().Informer()}, nil // Group=idp.pinniped.dev, Version=v1alpha1 case idpv1alpha1.SchemeGroupVersion.WithResource("webhookidentityproviders"): diff --git a/generated/1.19/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go b/generated/1.19/client/listers/config/v1alpha1/credentialissuerconfig.go similarity index 98% rename from generated/1.19/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go rename to generated/1.19/client/listers/config/v1alpha1/credentialissuerconfig.go index e1f869a0..79d9060d 100644 --- a/generated/1.19/client/listers/crdpinniped/v1alpha1/credentialissuerconfig.go +++ b/generated/1.19/client/listers/config/v1alpha1/credentialissuerconfig.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - v1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + v1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/generated/1.19/client/listers/crdpinniped/v1alpha1/expansion_generated.go b/generated/1.19/client/listers/config/v1alpha1/expansion_generated.go similarity index 100% rename from generated/1.19/client/listers/crdpinniped/v1alpha1/expansion_generated.go rename to generated/1.19/client/listers/config/v1alpha1/expansion_generated.go diff --git a/generated/1.19/client/openapi/zz_generated.openapi.go b/generated/1.19/client/openapi/zz_generated.openapi.go index ce780574..24e421b4 100644 --- a/generated/1.19/client/openapi/zz_generated.openapi.go +++ b/generated/1.19/client/openapi/zz_generated.openapi.go @@ -17,84 +17,84 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfig": schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref), - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigList": schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref), - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus": schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref), - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy": schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.Condition": schema_119_apis_idp_v1alpha1_Condition(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.TLSSpec": schema_119_apis_idp_v1alpha1_TLSSpec(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProvider": schema_119_apis_idp_v1alpha1_WebhookIdentityProvider(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), - "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), - "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.ClusterCredential": schema_119_apis_login_v1alpha1_ClusterCredential(ref), - "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequest": schema_119_apis_login_v1alpha1_TokenCredentialRequest(ref), - "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestList": schema_119_apis_login_v1alpha1_TokenCredentialRequestList(ref), - "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_119_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_119_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequest": schema_119_apis_pinniped_v1alpha1_CredentialRequest(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_119_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestList": schema_119_apis_pinniped_v1alpha1_CredentialRequestList(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_119_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_119_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), - "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_119_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), - "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), - "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), - "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), - "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), - "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfig": schema_119_apis_config_v1alpha1_CredentialIssuerConfig(ref), + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo": schema_119_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref), + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigList": schema_119_apis_config_v1alpha1_CredentialIssuerConfigList(ref), + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStatus": schema_119_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref), + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStrategy": schema_119_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.Condition": schema_119_apis_idp_v1alpha1_Condition(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.TLSSpec": schema_119_apis_idp_v1alpha1_TLSSpec(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProvider": schema_119_apis_idp_v1alpha1_WebhookIdentityProvider(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderList": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderList(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderSpec": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderSpec(ref), + "go.pinniped.dev/generated/1.19/apis/idp/v1alpha1.WebhookIdentityProviderStatus": schema_119_apis_idp_v1alpha1_WebhookIdentityProviderStatus(ref), + "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.ClusterCredential": schema_119_apis_login_v1alpha1_ClusterCredential(ref), + "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequest": schema_119_apis_login_v1alpha1_TokenCredentialRequest(ref), + "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestList": schema_119_apis_login_v1alpha1_TokenCredentialRequestList(ref), + "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestSpec": schema_119_apis_login_v1alpha1_TokenCredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.19/apis/login/v1alpha1.TokenCredentialRequestStatus": schema_119_apis_login_v1alpha1_TokenCredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequest": schema_119_apis_pinniped_v1alpha1_CredentialRequest(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestCredential": schema_119_apis_pinniped_v1alpha1_CredentialRequestCredential(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestList": schema_119_apis_pinniped_v1alpha1_CredentialRequestList(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestSpec": schema_119_apis_pinniped_v1alpha1_CredentialRequestSpec(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestStatus": schema_119_apis_pinniped_v1alpha1_CredentialRequestStatus(ref), + "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1.CredentialRequestTokenCredential": schema_119_apis_pinniped_v1alpha1_CredentialRequestTokenCredential(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIResourceList": schema_pkg_apis_meta_v1_APIResourceList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.APIVersions": schema_pkg_apis_meta_v1_APIVersions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Condition": schema_pkg_apis_meta_v1_Condition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.CreateOptions": schema_pkg_apis_meta_v1_CreateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.DeleteOptions": schema_pkg_apis_meta_v1_DeleteOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Duration": schema_pkg_apis_meta_v1_Duration(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ExportOptions": schema_pkg_apis_meta_v1_ExportOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.FieldsV1": schema_pkg_apis_meta_v1_FieldsV1(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GetOptions": schema_pkg_apis_meta_v1_GetOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupKind": schema_pkg_apis_meta_v1_GroupKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupResource": schema_pkg_apis_meta_v1_GroupResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersion": schema_pkg_apis_meta_v1_GroupVersion(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionForDiscovery": schema_pkg_apis_meta_v1_GroupVersionForDiscovery(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionKind": schema_pkg_apis_meta_v1_GroupVersionKind(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.GroupVersionResource": schema_pkg_apis_meta_v1_GroupVersionResource(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.InternalEvent": schema_pkg_apis_meta_v1_InternalEvent(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector": schema_pkg_apis_meta_v1_LabelSelector(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelectorRequirement": schema_pkg_apis_meta_v1_LabelSelectorRequirement(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.List": schema_pkg_apis_meta_v1_List(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta": schema_pkg_apis_meta_v1_ListMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ListOptions": schema_pkg_apis_meta_v1_ListOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ManagedFieldsEntry": schema_pkg_apis_meta_v1_ManagedFieldsEntry(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.MicroTime": schema_pkg_apis_meta_v1_MicroTime(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta": schema_pkg_apis_meta_v1_ObjectMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.OwnerReference": schema_pkg_apis_meta_v1_OwnerReference(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadata": schema_pkg_apis_meta_v1_PartialObjectMetadata(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PartialObjectMetadataList": schema_pkg_apis_meta_v1_PartialObjectMetadataList(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Patch": schema_pkg_apis_meta_v1_Patch(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.PatchOptions": schema_pkg_apis_meta_v1_PatchOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Preconditions": schema_pkg_apis_meta_v1_Preconditions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.RootPaths": schema_pkg_apis_meta_v1_RootPaths(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.ServerAddressByClientCIDR": schema_pkg_apis_meta_v1_ServerAddressByClientCIDR(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Status": schema_pkg_apis_meta_v1_Status(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusCause": schema_pkg_apis_meta_v1_StatusCause(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.StatusDetails": schema_pkg_apis_meta_v1_StatusDetails(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Table": schema_pkg_apis_meta_v1_Table(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableColumnDefinition": schema_pkg_apis_meta_v1_TableColumnDefinition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableOptions": schema_pkg_apis_meta_v1_TableOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRow": schema_pkg_apis_meta_v1_TableRow(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TableRowCondition": schema_pkg_apis_meta_v1_TableRowCondition(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Time": schema_pkg_apis_meta_v1_Time(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.Timestamp": schema_pkg_apis_meta_v1_Timestamp(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.TypeMeta": schema_pkg_apis_meta_v1_TypeMeta(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.UpdateOptions": schema_pkg_apis_meta_v1_UpdateOptions(ref), + "k8s.io/apimachinery/pkg/apis/meta/v1.WatchEvent": schema_pkg_apis_meta_v1_WatchEvent(ref), + "k8s.io/apimachinery/pkg/runtime.RawExtension": schema_k8sio_apimachinery_pkg_runtime_RawExtension(ref), + "k8s.io/apimachinery/pkg/runtime.TypeMeta": schema_k8sio_apimachinery_pkg_runtime_TypeMeta(ref), + "k8s.io/apimachinery/pkg/runtime.Unknown": schema_k8sio_apimachinery_pkg_runtime_Unknown(ref), + "k8s.io/apimachinery/pkg/version.Info": schema_k8sio_apimachinery_pkg_version_Info(ref), } } -func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_119_apis_config_v1alpha1_CredentialIssuerConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -122,7 +122,7 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe "status": { SchemaProps: spec.SchemaProps{ Description: "Status of the credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus"), + Ref: ref("go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStatus"), }, }, }, @@ -130,11 +130,11 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfig(ref common.Refe }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_119_apis_config_v1alpha1_CredentialIssuerConfigKubeConfigInfo(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -162,7 +162,7 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigKubeConfigInfo(r } } -func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_119_apis_config_v1alpha1_CredentialIssuerConfigList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -193,7 +193,7 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfig"), + Ref: ref("go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfig"), }, }, }, @@ -204,11 +204,11 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigList(ref common. }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfig", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_119_apis_config_v1alpha1_CredentialIssuerConfigStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -222,7 +222,7 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"), + Ref: ref("go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStrategy"), }, }, }, @@ -231,7 +231,7 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo "kubeConfigInfo": { SchemaProps: spec.SchemaProps{ Description: "Information needed to form a valid Pinniped-based kubeconfig using this credential issuer.", - Ref: ref("go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), + Ref: ref("go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo"), }, }, }, @@ -239,11 +239,11 @@ func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStatus(ref commo }, }, Dependencies: []string{ - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1.CredentialIssuerConfigStrategy"}, + "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigKubeConfigInfo", "go.pinniped.dev/generated/1.19/apis/config/v1alpha1.CredentialIssuerConfigStrategy"}, } } -func schema_119_apis_crdpinniped_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_119_apis_config_v1alpha1_CredentialIssuerConfigStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/generated/1.19/crds/crd.pinniped.dev_credentialissuerconfigs.yaml b/generated/1.19/crds/config.pinniped.dev_credentialissuerconfigs.yaml similarity index 97% rename from generated/1.19/crds/crd.pinniped.dev_credentialissuerconfigs.yaml rename to generated/1.19/crds/config.pinniped.dev_credentialissuerconfigs.yaml index e47f8e63..370df951 100644 --- a/generated/1.19/crds/crd.pinniped.dev_credentialissuerconfigs.yaml +++ b/generated/1.19/crds/config.pinniped.dev_credentialissuerconfigs.yaml @@ -6,9 +6,9 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.4.0 creationTimestamp: null - name: credentialissuerconfigs.crd.pinniped.dev + name: credentialissuerconfigs.config.pinniped.dev spec: - group: crd.pinniped.dev + group: config.pinniped.dev names: kind: CredentialIssuerConfig listKind: CredentialIssuerConfigList diff --git a/hack/lib/docs/config.yaml b/hack/lib/docs/config.yaml index ba696fbf..8456aa9c 100644 --- a/hack/lib/docs/config.yaml +++ b/hack/lib/docs/config.yaml @@ -3,7 +3,7 @@ processor: # Ignore internal API versions ignoreGroupVersions: - - "crd.pinniped.dev/crdpinniped" + - "config.pinniped.dev/config" - "idp.pinniped.dev/idp" - "pinniped.dev/pinniped" - "login.pinniped.dev/login" diff --git a/hack/lib/update-codegen.sh b/hack/lib/update-codegen.sh index 5447466e..466b25f1 100755 --- a/hack/lib/update-codegen.sh +++ b/hack/lib/update-codegen.sh @@ -109,7 +109,7 @@ echo "generating API-related code for our public API groups..." deepcopy \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/apis" \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/apis" \ - "pinniped:v1alpha1 crdpinniped:v1alpha1 idp:v1alpha1 login:v1alpha1" \ + "pinniped:v1alpha1 config:v1alpha1 idp:v1alpha1 login:v1alpha1" \ --go-header-file "${ROOT}/hack/boilerplate.go.txt" 2>&1 | sed "s|^|gen-api > |" ) @@ -121,7 +121,7 @@ echo "generating API-related code for our internal API groups..." "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/client" \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/apis" \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/apis" \ - "pinniped:v1alpha1 crdpinniped:v1alpha1 idp:v1alpha1 login:v1alpha1" \ + "pinniped:v1alpha1 config:v1alpha1 idp:v1alpha1 login:v1alpha1" \ --go-header-file "${ROOT}/hack/boilerplate.go.txt" 2>&1 | sed "s|^|gen-int-api > |" ) @@ -136,7 +136,7 @@ echo "generating client code for our public API groups..." client,lister,informer \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/client" \ "${BASE_PKG}/generated/${KUBE_MINOR_VERSION}/apis" \ - "pinniped:v1alpha1 crdpinniped:v1alpha1 idp:v1alpha1 login:v1alpha1" \ + "pinniped:v1alpha1 config:v1alpha1 idp:v1alpha1 login:v1alpha1" \ --go-header-file "${ROOT}/hack/boilerplate.go.txt" 2>&1 | sed "s|^|gen-client > |" ) @@ -155,6 +155,6 @@ crd-ref-docs \ # Generate CRD YAML (cd apis && - controller-gen paths=./crdpinniped/v1alpha1 crd:trivialVersions=true output:crd:artifacts:config=../crds && + controller-gen paths=./config/v1alpha1 crd:trivialVersions=true output:crd:artifacts:config=../crds && controller-gen paths=./idp/v1alpha1 crd:trivialVersions=true output:crd:artifacts:config=../crds ) diff --git a/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go b/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go index 1f6c2460..1676cd11 100644 --- a/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go +++ b/internal/controller/issuerconfig/create_or_update_credential_issuer_config.go @@ -12,7 +12,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/retry" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedclientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" ) @@ -20,11 +20,11 @@ func CreateOrUpdateCredentialIssuerConfig( ctx context.Context, credentialIssuerConfigNamespace string, pinnipedClient pinnipedclientset.Interface, - applyUpdatesToCredentialIssuerConfigFunc func(configToUpdate *crdpinnipedv1alpha1.CredentialIssuerConfig), + applyUpdatesToCredentialIssuerConfigFunc func(configToUpdate *configv1alpha1.CredentialIssuerConfig), ) error { err := retry.RetryOnConflict(retry.DefaultRetry, func() error { existingCredentialIssuerConfig, err := pinnipedClient. - CrdV1alpha1(). + ConfigV1alpha1(). CredentialIssuerConfigs(credentialIssuerConfigNamespace). Get(ctx, ConfigName, metav1.GetOptions{}) @@ -51,14 +51,14 @@ func CreateOrUpdateCredentialIssuerConfig( func createOrUpdateCredentialIssuerConfig( ctx context.Context, - existingCredentialIssuerConfig *crdpinnipedv1alpha1.CredentialIssuerConfig, + existingCredentialIssuerConfig *configv1alpha1.CredentialIssuerConfig, notFound bool, credentialIssuerConfigName string, credentialIssuerConfigNamespace string, pinnipedClient pinnipedclientset.Interface, - applyUpdatesToCredentialIssuerConfigFunc func(configToUpdate *crdpinnipedv1alpha1.CredentialIssuerConfig), + applyUpdatesToCredentialIssuerConfigFunc func(configToUpdate *configv1alpha1.CredentialIssuerConfig), ) error { - credentialIssuerConfigsClient := pinnipedClient.CrdV1alpha1().CredentialIssuerConfigs(credentialIssuerConfigNamespace) + credentialIssuerConfigsClient := pinnipedClient.ConfigV1alpha1().CredentialIssuerConfigs(credentialIssuerConfigNamespace) if notFound { // Create it @@ -89,15 +89,15 @@ func createOrUpdateCredentialIssuerConfig( func minimalValidCredentialIssuerConfig( credentialIssuerConfigName string, credentialIssuerConfigNamespace string, -) *crdpinnipedv1alpha1.CredentialIssuerConfig { - return &crdpinnipedv1alpha1.CredentialIssuerConfig{ +) *configv1alpha1.CredentialIssuerConfig { + return &configv1alpha1.CredentialIssuerConfig{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ Name: credentialIssuerConfigName, Namespace: credentialIssuerConfigNamespace, }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{ - Strategies: []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{}, + Status: configv1alpha1.CredentialIssuerConfigStatus{ + Strategies: []configv1alpha1.CredentialIssuerConfigStrategy{}, KubeConfigInfo: nil, }, } diff --git a/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go b/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go index 02a23df3..9a0832a2 100644 --- a/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go +++ b/internal/controller/issuerconfig/create_or_update_credential_issuer_config_test.go @@ -19,8 +19,7 @@ import ( coretesting "k8s.io/client-go/testing" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedfake "go.pinniped.dev/generated/1.19/client/clientset/versioned/fake" ) @@ -38,8 +37,8 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { ctx = context.Background() pinnipedAPIClient = pinnipedfake.NewSimpleClientset() credentialIssuerConfigGVR = schema.GroupVersionResource{ - Group: crdpinnipedv1alpha1.GroupName, - Version: crdpinnipedv1alpha1.SchemeGroupVersion.Version, + Group: configv1alpha1.GroupName, + Version: configv1alpha1.SchemeGroupVersion.Version, Resource: "credentialissuerconfigs", } }) @@ -47,8 +46,8 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { when("the config does not exist", func() { it("creates a new config which includes only the updates made by the func parameter", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) { - configToUpdate.Status.KubeConfigInfo = &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { + configToUpdate.Status.KubeConfigInfo = &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ CertificateAuthorityData: "some-ca-value", } }, @@ -60,15 +59,15 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { expectedCreateAction := coretesting.NewCreateAction( credentialIssuerConfigGVR, installationNamespace, - &crdpinnipedv1alpha1.CredentialIssuerConfig{ + &configv1alpha1.CredentialIssuerConfig{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ Name: configName, Namespace: installationNamespace, }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{ - Strategies: []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{}, - KubeConfigInfo: &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + Status: configv1alpha1.CredentialIssuerConfigStatus{ + Strategies: []configv1alpha1.CredentialIssuerConfigStrategy{}, + KubeConfigInfo: &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: "", CertificateAuthorityData: "some-ca-value", }, @@ -88,7 +87,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("returns an error", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) {}, + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) {}, ) r.EqualError(err, "could not create or update credentialissuerconfig: create failed: error on create") }) @@ -96,26 +95,26 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { }) when("the config already exists", func() { - var existingConfig *crdpinnipedv1alpha1.CredentialIssuerConfig + var existingConfig *configv1alpha1.CredentialIssuerConfig it.Before(func() { - existingConfig = &crdpinnipedv1alpha1.CredentialIssuerConfig{ + existingConfig = &configv1alpha1.CredentialIssuerConfig{ TypeMeta: metav1.TypeMeta{}, ObjectMeta: metav1.ObjectMeta{ Name: configName, Namespace: installationNamespace, }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{ - Strategies: []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{ + Status: configv1alpha1.CredentialIssuerConfigStatus{ + Strategies: []configv1alpha1.CredentialIssuerConfigStrategy{ { - Type: crdpinnipedv1alpha1.KubeClusterSigningCertificateStrategyType, - Status: crdpinnipedv1alpha1.SuccessStrategyStatus, - Reason: crdpinnipedv1alpha1.FetchedKeyStrategyReason, + Type: configv1alpha1.KubeClusterSigningCertificateStrategyType, + Status: configv1alpha1.SuccessStrategyStatus, + Reason: configv1alpha1.FetchedKeyStrategyReason, Message: "initial-message", LastUpdateTime: metav1.Now(), }, }, - KubeConfigInfo: &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + KubeConfigInfo: &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: "initial-server-value", CertificateAuthorityData: "initial-ca-value", }, @@ -126,7 +125,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("updates the existing config to only apply the updates made by the func parameter", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) { + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { configToUpdate.Status.KubeConfigInfo.CertificateAuthorityData = "new-ca-value" }, ) @@ -144,7 +143,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("avoids the cost of an update if the local updates made by the func parameter did not actually change anything", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) { + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { configToUpdate.Status.KubeConfigInfo.CertificateAuthorityData = "initial-ca-value" t := configToUpdate.Status.Strategies[0].LastUpdateTime @@ -168,7 +167,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("returns an error", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) {}, + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) {}, ) r.EqualError(err, "could not create or update credentialissuerconfig: get failed: error on get") }) @@ -183,7 +182,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("returns an error", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) { + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { configToUpdate.Status.KubeConfigInfo.CertificateAuthorityData = "new-ca-value" }, ) @@ -192,7 +191,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { }) when("there is a conflict error while updating the existing object on the first try and the next try succeeds", func() { - var slightlyDifferentExistingConfig *crdpinnipedv1alpha1.CredentialIssuerConfig + var slightlyDifferentExistingConfig *configv1alpha1.CredentialIssuerConfig it.Before(func() { hit := false @@ -217,7 +216,7 @@ func TestCreateOrUpdateCredentialIssuerConfig(t *testing.T) { it("retries updates on conflict", func() { err := CreateOrUpdateCredentialIssuerConfig(ctx, installationNamespace, pinnipedAPIClient, - func(configToUpdate *v1alpha1.CredentialIssuerConfig) { + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { configToUpdate.Status.KubeConfigInfo.CertificateAuthorityData = "new-ca-value" }, ) diff --git a/internal/controller/issuerconfig/publisher.go b/internal/controller/issuerconfig/publisher.go index 87531b58..70257dba 100644 --- a/internal/controller/issuerconfig/publisher.go +++ b/internal/controller/issuerconfig/publisher.go @@ -12,9 +12,9 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedclientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" - crdpinnipedv1alpha1informers "go.pinniped.dev/generated/1.19/client/informers/externalversions/crdpinniped/v1alpha1" + configv1alpha1informers "go.pinniped.dev/generated/1.19/client/informers/externalversions/config/v1alpha1" pinnipedcontroller "go.pinniped.dev/internal/controller" "go.pinniped.dev/internal/controllerlib" ) @@ -33,7 +33,7 @@ type publisherController struct { serverOverride *string pinnipedClient pinnipedclientset.Interface configMapInformer corev1informers.ConfigMapInformer - credentialIssuerConfigInformer crdpinnipedv1alpha1informers.CredentialIssuerConfigInformer + credentialIssuerConfigInformer configv1alpha1informers.CredentialIssuerConfigInformer } func NewPublisherController( @@ -41,7 +41,7 @@ func NewPublisherController( serverOverride *string, pinnipedClient pinnipedclientset.Interface, configMapInformer corev1informers.ConfigMapInformer, - credentialIssuerConfigInformer crdpinnipedv1alpha1informers.CredentialIssuerConfigInformer, + credentialIssuerConfigInformer configv1alpha1informers.CredentialIssuerConfigInformer, withInformer pinnipedcontroller.WithInformerOptionFunc, ) controllerlib.Controller { return controllerlib.New( @@ -118,8 +118,8 @@ func (c *publisherController) Sync(ctx controllerlib.Context) error { return fmt.Errorf("could not get credentialissuerconfig: %w", err) } - updateServerAndCAFunc := func(c *crdpinnipedv1alpha1.CredentialIssuerConfig) { - c.Status.KubeConfigInfo = &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + updateServerAndCAFunc := func(c *configv1alpha1.CredentialIssuerConfig) { + c.Status.KubeConfigInfo = &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: server, CertificateAuthorityData: certificateAuthorityData, } diff --git a/internal/controller/issuerconfig/publisher_test.go b/internal/controller/issuerconfig/publisher_test.go index 18f8558e..e03f7318 100644 --- a/internal/controller/issuerconfig/publisher_test.go +++ b/internal/controller/issuerconfig/publisher_test.go @@ -20,7 +20,7 @@ import ( kubernetesfake "k8s.io/client-go/kubernetes/fake" coretesting "k8s.io/client-go/testing" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedfake "go.pinniped.dev/generated/1.19/client/clientset/versioned/fake" pinnipedinformers "go.pinniped.dev/generated/1.19/client/informers/externalversions" "go.pinniped.dev/internal/controllerlib" @@ -41,7 +41,7 @@ func TestInformerFilters(t *testing.T) { r = require.New(t) observableWithInformerOption = testutil.NewObservableWithInformerOption() configMapInformer := kubeinformers.NewSharedInformerFactory(nil, 0).Core().V1().ConfigMaps() - credentialIssuerConfigInformer := pinnipedinformers.NewSharedInformerFactory(nil, 0).Crd().V1alpha1().CredentialIssuerConfigs() + credentialIssuerConfigInformer := pinnipedinformers.NewSharedInformerFactory(nil, 0).Config().V1alpha1().CredentialIssuerConfigs() _ = NewPublisherController( installedInNamespace, nil, @@ -104,20 +104,20 @@ func TestInformerFilters(t *testing.T) { when("watching CredentialIssuerConfig objects", func() { var subject controllerlib.Filter - var target, wrongNamespace, wrongName, unrelated *crdpinnipedv1alpha1.CredentialIssuerConfig + var target, wrongNamespace, wrongName, unrelated *configv1alpha1.CredentialIssuerConfig it.Before(func() { subject = credentialIssuerConfigInformerFilter - target = &crdpinnipedv1alpha1.CredentialIssuerConfig{ + target = &configv1alpha1.CredentialIssuerConfig{ ObjectMeta: metav1.ObjectMeta{Name: "pinniped-config", Namespace: installedInNamespace}, } - wrongNamespace = &crdpinnipedv1alpha1.CredentialIssuerConfig{ + wrongNamespace = &configv1alpha1.CredentialIssuerConfig{ ObjectMeta: metav1.ObjectMeta{Name: "pinniped-config", Namespace: "wrong-namespace"}, } - wrongName = &crdpinnipedv1alpha1.CredentialIssuerConfig{ + wrongName = &configv1alpha1.CredentialIssuerConfig{ ObjectMeta: metav1.ObjectMeta{Name: "wrong-name", Namespace: installedInNamespace}, } - unrelated = &crdpinnipedv1alpha1.CredentialIssuerConfig{ + unrelated = &configv1alpha1.CredentialIssuerConfig{ ObjectMeta: metav1.ObjectMeta{Name: "wrong-name", Namespace: "wrong-namespace"}, } }) @@ -177,20 +177,20 @@ func TestSync(t *testing.T) { var timeoutContextCancel context.CancelFunc var syncContext *controllerlib.Context - var expectedCredentialIssuerConfig = func(expectedNamespace, expectedServerURL, expectedCAData string) (schema.GroupVersionResource, *crdpinnipedv1alpha1.CredentialIssuerConfig) { + var expectedCredentialIssuerConfig = func(expectedNamespace, expectedServerURL, expectedCAData string) (schema.GroupVersionResource, *configv1alpha1.CredentialIssuerConfig) { expectedCredentialIssuerConfigGVR := schema.GroupVersionResource{ - Group: crdpinnipedv1alpha1.GroupName, + Group: configv1alpha1.GroupName, Version: "v1alpha1", Resource: "credentialissuerconfigs", } - expectedCredentialIssuerConfig := &crdpinnipedv1alpha1.CredentialIssuerConfig{ + expectedCredentialIssuerConfig := &configv1alpha1.CredentialIssuerConfig{ ObjectMeta: metav1.ObjectMeta{ Name: "pinniped-config", Namespace: expectedNamespace, }, - Status: crdpinnipedv1alpha1.CredentialIssuerConfigStatus{ - Strategies: []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{}, - KubeConfigInfo: &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ + Status: configv1alpha1.CredentialIssuerConfigStatus{ + Strategies: []configv1alpha1.CredentialIssuerConfigStrategy{}, + KubeConfigInfo: &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: expectedServerURL, CertificateAuthorityData: expectedCAData, }, @@ -208,7 +208,7 @@ func TestSync(t *testing.T) { serverOverride, pinnipedAPIClient, kubeInformers.Core().V1().ConfigMaps(), - pinnipedInformers.Crd().V1alpha1().CredentialIssuerConfigs(), + pinnipedInformers.Config().V1alpha1().CredentialIssuerConfigs(), controllerlib.WithInformer, ) diff --git a/internal/controllermanager/prepare_controllers.go b/internal/controllermanager/prepare_controllers.go index 18754a24..13b36b6a 100644 --- a/internal/controllermanager/prepare_controllers.go +++ b/internal/controllermanager/prepare_controllers.go @@ -64,7 +64,7 @@ func PrepareControllers( discoveryURLOverride, pinnipedClient, kubePublicNamespaceK8sInformers.Core().V1().ConfigMaps(), - installationNamespacePinnipedInformers.Crd().V1alpha1().CredentialIssuerConfigs(), + installationNamespacePinnipedInformers.Config().V1alpha1().CredentialIssuerConfigs(), controllerlib.WithInformer, ), singletonWorker, diff --git a/internal/server/server.go b/internal/server/server.go index 3daf6482..d38e537f 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -19,7 +19,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/klog/v2" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" pinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/pinniped/v1alpha1" pinnipedclientset "go.pinniped.dev/generated/1.19/client/clientset/versioned" "go.pinniped.dev/internal/apiserver" @@ -196,12 +196,12 @@ func getClusterCASigner(ctx context.Context, serverInstallationNamespace string) ctx, serverInstallationNamespace, pinnipedClient, - func(configToUpdate *crdpinnipedv1alpha1.CredentialIssuerConfig) { - configToUpdate.Status.Strategies = []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{ + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { + configToUpdate.Status.Strategies = []configv1alpha1.CredentialIssuerConfigStrategy{ { - Type: crdpinnipedv1alpha1.KubeClusterSigningCertificateStrategyType, - Status: crdpinnipedv1alpha1.SuccessStrategyStatus, - Reason: crdpinnipedv1alpha1.FetchedKeyStrategyReason, + Type: configv1alpha1.KubeClusterSigningCertificateStrategyType, + Status: configv1alpha1.SuccessStrategyStatus, + Reason: configv1alpha1.FetchedKeyStrategyReason, Message: "Key was fetched successfully", LastUpdateTime: metav1.Now(), }, @@ -217,12 +217,12 @@ func getClusterCASigner(ctx context.Context, serverInstallationNamespace string) ctx, serverInstallationNamespace, pinnipedClient, - func(configToUpdate *crdpinnipedv1alpha1.CredentialIssuerConfig) { - configToUpdate.Status.Strategies = []crdpinnipedv1alpha1.CredentialIssuerConfigStrategy{ + func(configToUpdate *configv1alpha1.CredentialIssuerConfig) { + configToUpdate.Status.Strategies = []configv1alpha1.CredentialIssuerConfigStrategy{ { - Type: crdpinnipedv1alpha1.KubeClusterSigningCertificateStrategyType, - Status: crdpinnipedv1alpha1.ErrorStrategyStatus, - Reason: crdpinnipedv1alpha1.CouldNotFetchKeyStrategyReason, + Type: configv1alpha1.KubeClusterSigningCertificateStrategyType, + Status: configv1alpha1.ErrorStrategyStatus, + Reason: configv1alpha1.CouldNotFetchKeyStrategyReason, Message: err.Error(), LastUpdateTime: metav1.Now(), }, diff --git a/test/integration/api_discovery_test.go b/test/integration/api_discovery_test.go index df6dd793..275045cd 100644 --- a/test/integration/api_discovery_test.go +++ b/test/integration/api_discovery_test.go @@ -56,20 +56,20 @@ func TestGetAPIResourceList(t *testing.T) { }, { group: metav1.APIGroup{ - Name: "crd.pinniped.dev", + Name: "config.pinniped.dev", Versions: []metav1.GroupVersionForDiscovery{ { - GroupVersion: "crd.pinniped.dev/v1alpha1", + GroupVersion: "config.pinniped.dev/v1alpha1", Version: "v1alpha1", }, }, PreferredVersion: metav1.GroupVersionForDiscovery{ - GroupVersion: "crd.pinniped.dev/v1alpha1", + GroupVersion: "config.pinniped.dev/v1alpha1", Version: "v1alpha1", }, }, resourceByVersion: map[string][]metav1.APIResource{ - "crd.pinniped.dev/v1alpha1": { + "config.pinniped.dev/v1alpha1": { { Name: "credentialissuerconfigs", SingularName: "credentialissuerconfig", diff --git a/test/integration/credentialissuerconfig_test.go b/test/integration/credentialissuerconfig_test.go index f7a4b1ff..befec19d 100644 --- a/test/integration/credentialissuerconfig_test.go +++ b/test/integration/credentialissuerconfig_test.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - crdpinnipedv1alpha1 "go.pinniped.dev/generated/1.19/apis/crdpinniped/v1alpha1" + configv1alpha1 "go.pinniped.dev/generated/1.19/apis/config/v1alpha1" "go.pinniped.dev/test/library" ) @@ -30,7 +30,7 @@ func TestCredentialIssuerConfig(t *testing.T) { t.Run("test successful CredentialIssuerConfig", func(t *testing.T) { actualConfigList, err := client. - CrdV1alpha1(). + ConfigV1alpha1(). CredentialIssuerConfigs(namespaceName). List(ctx, metav1.ListOptions{}) require.NoError(t, err) @@ -43,17 +43,17 @@ func TestCredentialIssuerConfig(t *testing.T) { actualStatusStrategies := actualConfigList.Items[0].Status.Strategies require.Len(t, actualStatusStrategies, 1) actualStatusStrategy := actualStatusStrategies[0] - require.Equal(t, crdpinnipedv1alpha1.KubeClusterSigningCertificateStrategyType, actualStatusStrategy.Type) + require.Equal(t, configv1alpha1.KubeClusterSigningCertificateStrategyType, actualStatusStrategy.Type) if library.ClusterHasCapability(t, library.ClusterSigningKeyIsAvailable) { - require.Equal(t, crdpinnipedv1alpha1.SuccessStrategyStatus, actualStatusStrategy.Status) - require.Equal(t, crdpinnipedv1alpha1.FetchedKeyStrategyReason, actualStatusStrategy.Reason) + require.Equal(t, configv1alpha1.SuccessStrategyStatus, actualStatusStrategy.Status) + require.Equal(t, configv1alpha1.FetchedKeyStrategyReason, actualStatusStrategy.Reason) require.Equal(t, "Key was fetched successfully", actualStatusStrategy.Message) // Verify the published kube config info. require.Equal(t, expectedStatusKubeConfigInfo(config), actualStatusKubeConfigInfo) } else { - require.Equal(t, crdpinnipedv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status) - require.Equal(t, crdpinnipedv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason) + require.Equal(t, configv1alpha1.ErrorStrategyStatus, actualStatusStrategy.Status) + require.Equal(t, configv1alpha1.CouldNotFetchKeyStrategyReason, actualStatusStrategy.Reason) require.Contains(t, actualStatusStrategy.Message, "did not find kube-controller-manager pod") // For now, don't verify the kube config info because its not available on GKE. We'll need to address // this somehow once we starting supporting those cluster types. @@ -68,7 +68,7 @@ func TestCredentialIssuerConfig(t *testing.T) { library.SkipUnlessClusterHasCapability(t, library.ClusterSigningKeyIsAvailable) existingConfig, err := client. - CrdV1alpha1(). + ConfigV1alpha1(). CredentialIssuerConfigs(namespaceName). Get(ctx, "pinniped-config", metav1.GetOptions{}) require.NoError(t, err) @@ -80,17 +80,17 @@ func TestCredentialIssuerConfig(t *testing.T) { updatedServerValue := "https://junk" existingConfig.Status.KubeConfigInfo.Server = updatedServerValue updatedConfig, err := client. - CrdV1alpha1(). + ConfigV1alpha1(). CredentialIssuerConfigs(namespaceName). Update(ctx, existingConfig, metav1.UpdateOptions{}) require.NoError(t, err) require.Equal(t, updatedServerValue, updatedConfig.Status.KubeConfigInfo.Server) // Expect that the object's mutated field is set back to what matches its source of truth by the controller. - var actualCredentialIssuerConfig *crdpinnipedv1alpha1.CredentialIssuerConfig + var actualCredentialIssuerConfig *configv1alpha1.CredentialIssuerConfig var configChangesServerField = func() bool { actualCredentialIssuerConfig, err = client. - CrdV1alpha1(). + ConfigV1alpha1(). CredentialIssuerConfigs(namespaceName). Get(ctx, "pinniped-config", metav1.GetOptions{}) return err == nil && actualCredentialIssuerConfig.Status.KubeConfigInfo.Server != updatedServerValue @@ -106,8 +106,8 @@ func TestCredentialIssuerConfig(t *testing.T) { }) } -func expectedStatusKubeConfigInfo(config *rest.Config) *crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo { - return &crdpinnipedv1alpha1.CredentialIssuerConfigKubeConfigInfo{ +func expectedStatusKubeConfigInfo(config *rest.Config) *configv1alpha1.CredentialIssuerConfigKubeConfigInfo { + return &configv1alpha1.CredentialIssuerConfigKubeConfigInfo{ Server: config.Host, CertificateAuthorityData: base64.StdEncoding.EncodeToString(config.TLSClientConfig.CAData), }