fix: update controller gen to v0.16.0 (#1067)

Author: britaniar

Makefile

@@ -1,5 +1,5 @@
 REGISTRY ?= ghcr.io
-KIND_IMAGE ?= kindest/node:v1.30.0
+KIND_IMAGE ?= kindest/node:v1.31.0
 ifndef TAG
 	TAG ?= $(shell git rev-parse --short=7 HEAD)
 endif
@@ -27,7 +27,7 @@ CLUSTER_CONFIG := $(abspath test/e2e/v1alpha1/kind-config.yaml)
 # Binaries
 # Note: Need to use abspath so we can invoke these from subdirectories
 
-CONTROLLER_GEN_VER := v0.15.0
+CONTROLLER_GEN_VER := v0.16.0
 CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
 

README.md

@@ -42,7 +42,7 @@ export this variable which specifies the number of member clusters that will be
 export MEMBER_CLUSTER_COUNT=1
 ```
 
-from the root directory of the repo run the following command, by default a hub cluster gets created which is the control plane for fleet (**The makefile uses kindest/node:v1.30.0**)
+from the root directory of the repo run the following command, by default a hub cluster gets created which is the control plane for fleet (**The makefile uses kindest/node:v1.31.0**)
 
 ```shell
 make setup-clusters

apis/placement/v1/clusterresourceplacement_types.go

@@ -664,7 +664,6 @@ type ResourcePlacementStatus struct {
 // FailedResourcePlacement contains the failure details of a failed resource placement.
 type FailedResourcePlacement struct {
 	// The resource failed to be placed.
-	// +required
 	ResourceIdentifier `json:",inline"`
 
 	// The failed condition status.

apis/placement/v1alpha1/override_types.go

@@ -97,7 +97,6 @@ type OverrideRule struct {
 
 	// JSONPatchOverrides defines a list of JSON patch override rules.
 	// This field is only allowed when OverrideType is JSONPatch.
-	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:MinItems=1
 	// +kubebuilder:validation:MaxItems=20
 	// +optional

apis/placement/v1beta1/clusterresourceplacement_types.go

@@ -951,7 +951,6 @@ type ResourcePlacementStatus struct {
 // FailedResourcePlacement contains the failure details of a failed resource placement.
 type FailedResourcePlacement struct {
 	// The resource failed to be placed.
-	// +kubebuilder:validation:Required
 	ResourceIdentifier `json:",inline"`
 
 	// The failed condition status.
@@ -986,7 +985,6 @@ type PatchDetail struct {
 // DriftedResourcePlacement contains the details of a resource with configuration drifts.
 type DriftedResourcePlacement struct {
 	// The resource that has drifted.
-	// +kubebuilder:validation:Required
 	ResourceIdentifier `json:",inline"`
 
 	// ObservationTime is the time when we observe the configuration drifts for the resource.
@@ -1021,7 +1019,6 @@ type DriftedResourcePlacement struct {
 // DiffedResourcePlacement contains the details of a resource with configuration differences.
 type DiffedResourcePlacement struct {
 	// The resource that has drifted.
-	// +kubebuilder:validation:Required
 	ResourceIdentifier `json:",inline"`
 
 	// ObservationTime is the time when we observe the configuration differences for the resource.

apis/v1alpha1/clusterresourceplacement_types.go

@@ -160,7 +160,7 @@ type ClusterResourcePlacementStatus struct {
 // ResourceIdentifier identifies one Kubernetes resource.
 type ResourceIdentifier struct {
 	// Group is the group name of the selected resource.
-	// +required
+	// +optional
 	Group string `json:"group,omitempty"`
 
 	// Version is the version of the selected resource.
@@ -183,7 +183,6 @@ type ResourceIdentifier struct {
 // FailedResourcePlacement contains the failure details of a failed resource placement.
 type FailedResourcePlacement struct {
 	// The resource failed to be placed.
-	// +required
 	ResourceIdentifier `json:",inline"`
 
 	// Name of the member cluster that the resource is placed to.

cmd/hubagent/main.go

@@ -126,7 +126,7 @@ func main() {
 		if err = (&mcv1alpha1.Reconciler{
 			Client:                  mgr.GetClient(),
 			NetworkingAgentsEnabled: opts.NetworkingAgentsEnabled,
-		}).SetupWithManager(mgr); err != nil {
+		}).SetupWithManager(mgr, "memberclusterv1alpha1-controller"); err != nil {
 			klog.ErrorS(err, "unable to create v1alpha1 controller", "controller", "MemberCluster")
 			exitWithErrorFunc()
 		}
@@ -138,7 +138,7 @@ func main() {
 			NetworkingAgentsEnabled: opts.NetworkingAgentsEnabled,
 			MaxConcurrentReconciles: int(math.Ceil(float64(opts.MaxFleetSizeSupported) / 100)), //one member cluster reconciler routine per 100 member clusters
 			ForceDeleteWaitTime:     opts.ForceDeleteWaitTime.Duration,
-		}).SetupWithManager(mgr); err != nil {
+		}).SetupWithManager(mgr, "membercluster-controller"); err != nil {
 			klog.ErrorS(err, "unable to create v1beta1 controller", "controller", "MemberCluster")
 			exitWithErrorFunc()
 		}

cmd/hubagent/options/ratelimit.go

@@ -37,7 +37,7 @@ func (o *RateLimitOptions) AddFlags(fs *flag.FlagSet) {
 }
 
 // DefaultControllerRateLimiter provide a default rate limiter for controller, and users can tune it by corresponding flags.
-func DefaultControllerRateLimiter(opts RateLimitOptions) workqueue.RateLimiter {
+func DefaultControllerRateLimiter(opts RateLimitOptions) workqueue.TypedRateLimiter[any] {
 	// set defaults
 	if opts.RateLimiterBaseDelay <= 0 {
 		opts.RateLimiterBaseDelay = 5 * time.Millisecond
@@ -51,8 +51,8 @@ func DefaultControllerRateLimiter(opts RateLimitOptions) workqueue.RateLimiter {
 	if opts.RateLimiterBucketSize <= 0 {
 		opts.RateLimiterBucketSize = 100
 	}
-	return workqueue.NewMaxOfRateLimiter(
-		workqueue.NewItemExponentialFailureRateLimiter(opts.RateLimiterBaseDelay, opts.RateLimiterMaxDelay),
-		&workqueue.BucketRateLimiter{Limiter: rate.NewLimiter(rate.Limit(opts.RateLimiterQPS), opts.RateLimiterBucketSize)},
+	return workqueue.NewTypedMaxOfRateLimiter[any](
+		workqueue.NewTypedItemExponentialFailureRateLimiter[any](opts.RateLimiterBaseDelay, opts.RateLimiterMaxDelay),
+		&workqueue.TypedBucketRateLimiter[any]{Limiter: rate.NewLimiter(rate.Limit(opts.RateLimiterQPS), opts.RateLimiterBucketSize)},
 	)
 }

cmd/memberagent/main.go

@@ -339,7 +339,7 @@ func Start(ctx context.Context, hubCfg, memberConfig *rest.Config, hubOpts, memb
 		}
 
 		klog.Info("Setting up the internalMemberCluster v1alpha1 controller")
-		if err = imcv1alpha1.NewReconciler(hubMgr.GetClient(), memberMgr.GetClient(), workController).SetupWithManager(hubMgr); err != nil {
+		if err = imcv1alpha1.NewReconciler(hubMgr.GetClient(), memberMgr.GetClient(), workController).SetupWithManager(hubMgr, "internalmemberclusterv1alpha1-controller"); err != nil {
 			klog.ErrorS(err, "Failed to create v1alpha1 controller", "controller", "internalMemberCluster")
 			return fmt.Errorf("unable to create internalMemberCluster v1alpha1 controller: %w", err)
 		}
@@ -401,7 +401,7 @@ func Start(ctx context.Context, hubCfg, memberConfig *rest.Config, hubOpts, memb
 			klog.ErrorS(err, "Failed to create InternalMemberCluster v1beta1 reconciler")
 			return fmt.Errorf("failed to create InternalMemberCluster v1beta1 reconciler: %w", err)
 		}
-		if err := imcReconciler.SetupWithManager(hubMgr); err != nil {
+		if err := imcReconciler.SetupWithManager(hubMgr, "internalmembercluster-controller"); err != nil {
 			klog.ErrorS(err, "Failed to set up InternalMemberCluster v1beta1 controller with the controller manager")
 			return fmt.Errorf("failed to set up InternalMemberCluster v1beta1 controller with the controller manager: %w", err)
 		}