Merge pull request #11968 from sbueringer/pr-crs-follow-up

k8s-ci-robot · web-flow · commit a86a739111ba · 2025-03-14T00:23:47.000-07:00
🌱 Cleanup after CRS move
diff --git a/.golangci-kal.yml b/.golangci-kal.yml
@@ -108,7 +108,7 @@ issues:
     text: "field Ref is marked as required, should not be a pointer"
     linters:
       - kal
-  - path: "api/v1alpha1/*|api/v1beta1/*|api/v1alpha3/*"
+  - path: "api/v1alpha1/*|api/v1beta1/*|api/v1alpha3/*|api/addons/v1beta1/*"
     text: "field Items must be marked as optional or required"
     linters:
       - kal
diff --git a/.golangci.yml b/.golangci.yml
@@ -282,12 +282,6 @@ issues:
   - linters:
       - staticcheck
     text: "SA1019: feature.ClusterResourceSet is deprecated: ClusterResourceSet feature is now GA and the corresponding feature flag will be removed in 1.12 release."
-  - linters:
-      - revive
-    text: "exported: type name will be used as clusterresourceset.ClusterResourceSetBindingReconciler by other packages, and that stutters; consider calling this BindingReconciler"
-  - linters:
-      - revive
-    text: "exported: type name will be used as clusterresourceset.ClusterResourceSetReconciler by other packages, and that stutters; consider calling this Reconciler"
   - linters:
     - revive
     text: "exported: exported method .*\\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported"
diff --git a/Makefile b/Makefile
@@ -387,11 +387,12 @@ generate-go-deepcopy:  ## Run all generate-go-deepcopy-* targets
 
 .PHONY: generate-go-deepcopy-core
 generate-go-deepcopy-core: $(CONTROLLER_GEN) ## Generate deepcopy go code for core
-	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./internal/apis/addons,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
+	$(MAKE) clean-generated-deepcopy SRC_DIRS="./api,./internal/apis/addons,./internal/apis/core,./$(EXP_DIR)/api,./$(EXP_DIR)/runtime/api,./$(EXP_DIR)/runtime/hooks/api"
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
 		paths=./api/... \
 		paths=./internal/apis/addons/... \
+		paths=./internal/apis/core/... \
 		paths=./$(EXP_DIR)/api/... \
 		paths=./$(EXP_DIR)/ipam/api/... \
 		paths=./$(EXP_DIR)/runtime/api/... \
@@ -533,7 +534,7 @@ generate-go-conversions-test-extension: $(CONVERSION_GEN) ## Generate conversion
 .PHONY: generate-go-openapi
 generate-go-openapi: $(OPENAPI_GEN) ## Generate openapi go code for runtime SDK
 	@mkdir -p ./tmp/sigs.k8s.io; ln -s $(ROOT_DIR) ./tmp/sigs.k8s.io/; cd ./tmp; \
-	for pkg in "api/v1beta1" "api/addons/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
+	for pkg in "api/v1beta1" "$(EXP_DIR)/runtime/hooks/api/v1alpha1"; do \
 		(cd ../ && $(MAKE) clean-generated-openapi-definitions SRC_DIRS="./$${pkg}"); \
 		echo "** Generating openapi schema for types in ./$${pkg} **"; \
 		$(OPENAPI_GEN) \
diff --git a/api/addons/v1beta1/clusterresourceset_types.go b/api/addons/v1beta1/clusterresourceset_types.go
@@ -205,7 +205,6 @@ type ClusterResourceSetList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty"`
 	// items is the list of ClusterResourceSets.
-	// +required
 	Items []ClusterResourceSet `json:"items"`
 }
 
diff --git a/api/addons/v1beta1/clusterresourcesetbinding_types.go b/api/addons/v1beta1/clusterresourcesetbinding_types.go
@@ -219,7 +219,6 @@ type ClusterResourceSetBindingList struct {
 	// +optional
 	metav1.ListMeta `json:"metadata,omitempty"`
 	// items is the list of ClusterResourceSetBindings.
-	// +required
 	Items []ClusterResourceSetBinding `json:"items"`
 }
 
diff --git a/controllers/alias.go b/controllers/alias.go
@@ -33,6 +33,7 @@ import (
 	clustercontroller "sigs.k8s.io/cluster-api/internal/controllers/cluster"
 	clusterclasscontroller "sigs.k8s.io/cluster-api/internal/controllers/clusterclass"
 	"sigs.k8s.io/cluster-api/internal/controllers/clusterresourceset"
+	"sigs.k8s.io/cluster-api/internal/controllers/clusterresourcesetbinding"
 	machinecontroller "sigs.k8s.io/cluster-api/internal/controllers/machine"
 	machinedeploymentcontroller "sigs.k8s.io/cluster-api/internal/controllers/machinedeployment"
 	machinehealthcheckcontroller "sigs.k8s.io/cluster-api/internal/controllers/machinehealthcheck"
@@ -255,7 +256,7 @@ type ClusterResourceSetReconciler struct {
 }
 
 func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options, partialSecretCache cache.Cache) error {
-	return (&clusterresourceset.ClusterResourceSetReconciler{
+	return (&clusterresourceset.Reconciler{
 		Client:           r.Client,
 		ClusterCache:     r.ClusterCache,
 		WatchFilterValue: r.WatchFilterValue,
@@ -271,7 +272,7 @@ type ClusterResourceSetBindingReconciler struct {
 }
 
 func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
-	return (&clusterresourceset.ClusterResourceSetBindingReconciler{
+	return (&clusterresourcesetbinding.Reconciler{
 		Client:           r.Client,
 		WatchFilterValue: r.WatchFilterValue,
 	}).SetupWithManager(ctx, mgr, options)
diff --git a/internal/controllers/clusterresourceset/clusterresourceset_controller.go b/internal/controllers/clusterresourceset/clusterresourceset_controller.go
@@ -61,16 +61,16 @@ var ErrSecretTypeNotSupported = errors.New("unsupported secret type")
 // +kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=*,verbs=get;list;watch;create;update;patch;delete
 // +kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=clusterresourcesets/status;clusterresourcesets/finalizers,verbs=get;update;patch
 
-// ClusterResourceSetReconciler reconciles a ClusterResourceSet object.
-type ClusterResourceSetReconciler struct {
+// Reconciler reconciles a ClusterResourceSet object.
+type Reconciler struct {
 	Client       client.Client
 	ClusterCache clustercache.ClusterCache
 
 	// WatchFilterValue is the label value used to filter events prior to reconciliation.
 	WatchFilterValue string
 }
 
-func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options, partialSecretCache cache.Cache) error {
+func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options, partialSecretCache cache.Cache) error {
 	if r.Client == nil || r.ClusterCache == nil {
 		return errors.New("Client and ClusterCache must not be nil")
 	}
@@ -122,7 +122,7 @@ func (r *ClusterResourceSetReconciler) SetupWithManager(ctx context.Context, mgr
 	return nil
 }
 
-func (r *ClusterResourceSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
 	log := ctrl.LoggerFrom(ctx)
 
 	// Fetch the ClusterResourceSet instance.
@@ -214,7 +214,7 @@ func (r *ClusterResourceSetReconciler) Reconcile(ctx context.Context, req ctrl.R
 }
 
 // reconcileDelete removes the deleted ClusterResourceSet from all the ClusterResourceSetBindings it is added to.
-func (r *ClusterResourceSetReconciler) reconcileDelete(ctx context.Context, clusters []*clusterv1.Cluster, crs *addonsv1.ClusterResourceSet) error {
+func (r *Reconciler) reconcileDelete(ctx context.Context, clusters []*clusterv1.Cluster, crs *addonsv1.ClusterResourceSet) error {
 	for _, cluster := range clusters {
 		log := ctrl.LoggerFrom(ctx, "Cluster", klog.KObj(cluster))
 
@@ -260,7 +260,7 @@ func (r *ClusterResourceSetReconciler) reconcileDelete(ctx context.Context, clus
 }
 
 // getClustersByClusterResourceSetSelector fetches Clusters matched by the ClusterResourceSet's label selector that are in the same namespace as the ClusterResourceSet object.
-func (r *ClusterResourceSetReconciler) getClustersByClusterResourceSetSelector(ctx context.Context, clusterResourceSet *addonsv1.ClusterResourceSet) ([]*clusterv1.Cluster, error) {
+func (r *Reconciler) getClustersByClusterResourceSetSelector(ctx context.Context, clusterResourceSet *addonsv1.ClusterResourceSet) ([]*clusterv1.Cluster, error) {
 	log := ctrl.LoggerFrom(ctx)
 
 	clusterList := &clusterv1.ClusterList{}
@@ -296,7 +296,7 @@ func (r *ClusterResourceSetReconciler) getClustersByClusterResourceSetSelector(c
 // In Reconcile strategy, resources are re-applied to a particular cluster when their definition changes. The hash in ClusterResourceSetBinding is used to check
 // if a resource has changed or not.
 // TODO: If a resource already exists in the cluster but not applied by ClusterResourceSet, the resource will be updated ?
-func (r *ClusterResourceSetReconciler) ApplyClusterResourceSet(ctx context.Context, cluster *clusterv1.Cluster, clusterResourceSet *addonsv1.ClusterResourceSet) (rerr error) {
+func (r *Reconciler) ApplyClusterResourceSet(ctx context.Context, cluster *clusterv1.Cluster, clusterResourceSet *addonsv1.ClusterResourceSet) (rerr error) {
 	log := ctrl.LoggerFrom(ctx, "Cluster", klog.KObj(cluster))
 	ctx = ctrl.LoggerInto(ctx, log)
 
@@ -466,7 +466,7 @@ func (r *ClusterResourceSetReconciler) ApplyClusterResourceSet(ctx context.Conte
 // getResource retrieves the requested resource and convert it to unstructured type.
 // Unsupported resource kinds are not denied by validation webhook, hence no need to check here.
 // Only supports Secrets/Configmaps as resource types and allow using resources in the same namespace with the cluster.
-func (r *ClusterResourceSetReconciler) getResource(ctx context.Context, resourceRef addonsv1.ResourceRef, namespace string) (*unstructured.Unstructured, error) {
+func (r *Reconciler) getResource(ctx context.Context, resourceRef addonsv1.ResourceRef, namespace string) (*unstructured.Unstructured, error) {
 	resourceName := types.NamespacedName{Name: resourceRef.Name, Namespace: namespace}
 
 	var resourceInterface interface{}
@@ -500,7 +500,7 @@ func (r *ClusterResourceSetReconciler) getResource(ctx context.Context, resource
 }
 
 // ensureResourceOwnerRef adds the ClusterResourceSet as a OwnerReference to the resource.
-func (r *ClusterResourceSetReconciler) ensureResourceOwnerRef(ctx context.Context, clusterResourceSet *addonsv1.ClusterResourceSet, resource *unstructured.Unstructured) error {
+func (r *Reconciler) ensureResourceOwnerRef(ctx context.Context, clusterResourceSet *addonsv1.ClusterResourceSet, resource *unstructured.Unstructured) error {
 	obj := resource.DeepCopy()
 	patchHelper, err := patch.NewHelper(obj, r.Client)
 	if err != nil {
@@ -517,7 +517,7 @@ func (r *ClusterResourceSetReconciler) ensureResourceOwnerRef(ctx context.Contex
 }
 
 // clusterToClusterResourceSet is mapper function that maps clusters to ClusterResourceSet.
-func (r *ClusterResourceSetReconciler) clusterToClusterResourceSet(ctx context.Context, o client.Object) []ctrl.Request {
+func (r *Reconciler) clusterToClusterResourceSet(ctx context.Context, o client.Object) []ctrl.Request {
 	result := []ctrl.Request{}
 
 	cluster, ok := o.(*clusterv1.Cluster)
diff --git a/internal/controllers/clusterresourceset/clusterresourceset_helpers.go b/internal/controllers/clusterresourceset/clusterresourceset_helpers.go
@@ -32,7 +32,6 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -108,7 +107,7 @@ func createUnstructured(ctx context.Context, c client.Client, obj *unstructured.
 }
 
 // getOrCreateClusterResourceSetBinding retrieves ClusterResourceSetBinding resource owned by the cluster or create a new one if not found.
-func (r *ClusterResourceSetReconciler) getOrCreateClusterResourceSetBinding(ctx context.Context, cluster *clusterv1.Cluster, clusterResourceSet *addonsv1.ClusterResourceSet) (*addonsv1.ClusterResourceSetBinding, error) {
+func (r *Reconciler) getOrCreateClusterResourceSetBinding(ctx context.Context, cluster *clusterv1.Cluster, clusterResourceSet *addonsv1.ClusterResourceSet) (*addonsv1.ClusterResourceSetBinding, error) {
 	clusterResourceSetBinding := &addonsv1.ClusterResourceSetBinding{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      cluster.Name,
@@ -223,27 +222,6 @@ func normalizeData(resource *unstructured.Unstructured) ([][]byte, error) {
 	return dataList, nil
 }
 
-func getClusterNameFromOwnerRef(obj metav1.ObjectMeta) (string, error) {
-	for _, ref := range obj.GetOwnerReferences() {
-		if ref.Kind != "Cluster" {
-			continue
-		}
-		gv, err := schema.ParseGroupVersion(ref.APIVersion)
-		if err != nil {
-			return "", errors.Wrap(err, "failed to find cluster name in ownerRefs")
-		}
-
-		if gv.Group != clusterv1.GroupVersion.Group {
-			continue
-		}
-		if ref.Name == "" {
-			return "", errors.New("failed to find cluster name in ownerRefs: ref name is empty")
-		}
-		return ref.Name, nil
-	}
-	return "", errors.New("failed to find cluster name in ownerRefs: no cluster ownerRef")
-}
-
 // ensureKubernetesServiceCreated ensures that the Service for Kubernetes API Server has been created.
 func ensureKubernetesServiceCreated(ctx context.Context, client client.Client) error {
 	err := client.Get(ctx, types.NamespacedName{
diff --git a/internal/controllers/clusterresourceset/clusterresourceset_helpers_test.go b/internal/controllers/clusterresourceset/clusterresourceset_helpers_test.go
@@ -80,7 +80,7 @@ func TestGetorCreateClusterResourceSetBinding(t *testing.T) {
 	c := fake.NewClientBuilder().
 		WithObjects(testClusterResourceSetBinding).
 		Build()
-	r := &ClusterResourceSetReconciler{
+	r := &Reconciler{
 		Client: c,
 	}
 
diff --git a/internal/controllers/clusterresourceset/doc.go b/internal/controllers/clusterresourceset/doc.go
@@ -14,5 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package clusterresourceset implements experimental addon controllers.
+// Package clusterresourceset implements the ClusterResourceSet controller.
 package clusterresourceset
diff --git a/internal/controllers/clusterresourceset/suite_test.go b/internal/controllers/clusterresourceset/suite_test.go
@@ -38,6 +38,7 @@ import (
 	"sigs.k8s.io/cluster-api/api/v1beta1/index"
 	"sigs.k8s.io/cluster-api/controllers/clustercache"
 	"sigs.k8s.io/cluster-api/controllers/remote"
+	"sigs.k8s.io/cluster-api/internal/controllers/clusterresourcesetbinding"
 	"sigs.k8s.io/cluster-api/internal/test/envtest"
 )
 
@@ -105,14 +106,14 @@ func TestMain(m *testing.M) {
 			clusterCache.(interface{ Shutdown() }).Shutdown()
 		}()
 
-		reconciler := ClusterResourceSetReconciler{
+		reconciler := Reconciler{
 			Client:       mgr.GetClient(),
 			ClusterCache: clusterCache,
 		}
 		if err = reconciler.SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: 10}, partialSecretCache); err != nil {
 			panic(fmt.Sprintf("Failed to set up cluster resource set reconciler: %v", err))
 		}
-		bindingReconciler := ClusterResourceSetBindingReconciler{
+		bindingReconciler := clusterresourcesetbinding.Reconciler{
 			Client: mgr.GetClient(),
 		}
 		if err = bindingReconciler.SetupWithManager(ctx, mgr, controller.Options{MaxConcurrentReconciles: 10}); err != nil {
diff --git a/internal/controllers/clusterresourcesetbinding/clusterresourcesetbinding_controller.go b/internal/controllers/clusterresourcesetbinding/clusterresourcesetbinding_controller.go
@@ -14,14 +14,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package clusterresourceset
+package clusterresourcesetbinding
 
 import (
 	"context"
 
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -40,15 +41,15 @@ import (
 
 // +kubebuilder:rbac:groups=addons.cluster.x-k8s.io,resources=*,verbs=get;list;watch;create;update;patch;delete
 
-// ClusterResourceSetBindingReconciler reconciles a ClusterResourceSetBinding object.
-type ClusterResourceSetBindingReconciler struct {
+// Reconciler reconciles a ClusterResourceSetBinding object.
+type Reconciler struct {
 	Client client.Client
 
 	// WatchFilterValue is the label value used to filter events prior to reconciliation.
 	WatchFilterValue string
 }
 
-func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
 	if r.Client == nil {
 		return errors.New("Client must not be nil")
 	}
@@ -71,7 +72,7 @@ func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Conte
 	return nil
 }
 
-func (r *ClusterResourceSetBindingReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
+func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctrl.Result, reterr error) {
 	log := ctrl.LoggerFrom(ctx)
 
 	// Fetch the ClusterResourceSetBinding instance.
@@ -113,7 +114,7 @@ func (r *ClusterResourceSetBindingReconciler) Reconcile(ctx context.Context, req
 }
 
 // clusterToClusterResourceSetBinding is mapper function that maps clusters to ClusterResourceSetBinding.
-func (r *ClusterResourceSetBindingReconciler) clusterToClusterResourceSetBinding(_ context.Context, o client.Object) []ctrl.Request {
+func (r *Reconciler) clusterToClusterResourceSetBinding(_ context.Context, o client.Object) []ctrl.Request {
 	return []reconcile.Request{
 		{
 			NamespacedName: client.ObjectKey{
@@ -127,7 +128,7 @@ func (r *ClusterResourceSetBindingReconciler) clusterToClusterResourceSetBinding
 // updateClusterReference updates how the ClusterResourceSetBinding references the Cluster.
 // Before 1.4 cluster name was stored as an ownerReference. This function migrates the cluster name to the spec.clusterName and removes the Cluster OwnerReference.
 // Ref: https://github.com/kubernetes-sigs/cluster-api/issues/7669.
-func (r *ClusterResourceSetBindingReconciler) updateClusterReference(ctx context.Context, binding *addonsv1.ClusterResourceSetBinding) error {
+func (r *Reconciler) updateClusterReference(ctx context.Context, binding *addonsv1.ClusterResourceSetBinding) error {
 	patchHelper, err := patch.NewHelper(binding, r.Client)
 	if err != nil {
 		return err
@@ -154,3 +155,24 @@ func (r *ClusterResourceSetBindingReconciler) updateClusterReference(ctx context
 
 	return patchHelper.Patch(ctx, binding)
 }
+
+func getClusterNameFromOwnerRef(obj metav1.ObjectMeta) (string, error) {
+	for _, ref := range obj.GetOwnerReferences() {
+		if ref.Kind != "Cluster" {
+			continue
+		}
+		gv, err := schema.ParseGroupVersion(ref.APIVersion)
+		if err != nil {
+			return "", errors.Wrap(err, "failed to find cluster name in ownerRefs")
+		}
+
+		if gv.Group != clusterv1.GroupVersion.Group {
+			continue
+		}
+		if ref.Name == "" {
+			return "", errors.New("failed to find cluster name in ownerRefs: ref name is empty")
+		}
+		return ref.Name, nil
+	}
+	return "", errors.New("failed to find cluster name in ownerRefs: no cluster ownerRef")
+}
diff --git a/internal/controllers/clusterresourcesetbinding/doc.go b/internal/controllers/clusterresourcesetbinding/doc.go
@@ -1,8 +1,5 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
 /*
-Copyright The Kubernetes Authors.
+Copyright 2025 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,14 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Code generated by openapi-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	common "k8s.io/kube-openapi/pkg/common"
-)
-
-func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
-	return map[string]common.OpenAPIDefinition{}
-}
+// Package clusterresourcesetbinding implements the ClusterResourceSetBinding controller.
+package clusterresourcesetbinding
diff --git a/main.go b/main.go
@@ -77,7 +77,6 @@ import (
 	expv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/core/exp/v1alpha4"
 	clusterv1alpha3 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha3"
 	clusterv1alpha4 "sigs.k8s.io/cluster-api/internal/apis/core/v1alpha4"
-	crscontrollers "sigs.k8s.io/cluster-api/internal/controllers/clusterresourceset"
 	internalruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client"
 	runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry"
 	runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime"
@@ -702,15 +701,15 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager, watchNamespaces map
 	}
 
 	if feature.Gates.Enabled(feature.ClusterResourceSet) {
-		if err := (&crscontrollers.ClusterResourceSetReconciler{
+		if err := (&controllers.ClusterResourceSetReconciler{
 			Client:           mgr.GetClient(),
 			ClusterCache:     clusterCache,
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, concurrency(clusterResourceSetConcurrency), partialSecretCache); err != nil {
 			setupLog.Error(err, "Unable to create controller", "controller", "ClusterResourceSet")
 			os.Exit(1)
 		}
-		if err := (&crscontrollers.ClusterResourceSetBindingReconciler{
+		if err := (&controllers.ClusterResourceSetBindingReconciler{
 			Client:           mgr.GetClient(),
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, concurrency(clusterResourceSetConcurrency)); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,6 @@ type ClusterResourceSetList struct {`
`205`	`205`	`// +optional`
`206`	`206`	metav1.ListMeta `json:"metadata,omitempty"`
`207`	`207`	`// items is the list of ClusterResourceSets.`
`208`		`- // +required`
`209`	`208`	Items []ClusterResourceSet `json:"items"`
`210`	`209`	`}`
`211`	`210`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,6 @@ type ClusterResourceSetBindingList struct {`
`219`	`219`	`// +optional`
`220`	`220`	metav1.ListMeta `json:"metadata,omitempty"`
`221`	`221`	`// items is the list of ClusterResourceSetBindings.`
`222`		`- // +required`
`223`	`222`	Items []ClusterResourceSetBinding `json:"items"`
`224`	`223`	`}`
`225`	`224`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func TestGetorCreateClusterResourceSetBinding(t *testing.T) {`
`80`	`80`	`c := fake.NewClientBuilder().`
`81`	`81`	`WithObjects(testClusterResourceSetBinding).`
`82`	`82`	`Build()`
`83`		`- r := &ClusterResourceSetReconciler{`
	`83`	`+ r := &Reconciler{`
`84`	`84`	`Client: c,`
`85`	`85`	`}`
`86`	`86`