Move CredentialIssuerConfig into new "config.pinniped.dev" API group.

Signed-off-by: Matt Moyer <moyerm@vmware.com>

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,
 		},
 	}

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"
 						},
 					)

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,
 		}

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,
 			)