enhancement (CollaSet): fix linter and ut

Makefile

@@ -2,7 +2,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:202307101
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.25.0
+ENVTEST_K8S_VERSION = 1.22.6
 # kind cluster name for e2e
 CLUSTER_NAME ?= kindcluster
 # kind version for e2e

apis/apps/v1alpha1/collaset_types.go

@@ -82,6 +82,8 @@ type CollaSetSpec struct {
 	// insufficient replicas are detected. Each pod stamped out by the CollaSet
 	// will fulfill this Template, but have a unique identity from the rest
 	// of the CollaSet.
+	// +kubebuilder:pruning:PreserveUnknownFields
+	// +kubebuilder:validation:Schemaless
 	Template corev1.PodTemplateSpec `json:"template,omitempty"`
 
 	// VolumeClaimTemplates is a list of claims that pods are allowed to reference.

config/crd/bases/apps.kafed.io_resourcecontexts.yaml

@@ -3,7 +3,8 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.12.0
+    controller-gen.kubebuilder.io/version: v0.10.0
+  creationTimestamp: null
   name: resourcecontexts.apps.kafed.io
 spec:
   group: apps.kafed.io

config/rbac/role.yaml

@@ -2,6 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  creationTimestamp: null
   name: manager-role
 rules:
 - apiGroups:

pkg/controllers/collaset/synccontrol/sync_control.go

@@ -140,7 +140,7 @@ func (sc *RealSyncControl) Scale(set *appsv1alpha1.CollaSet, podWrappers []*coll
 		// find IDs and their contexts which have not been used by owned Pods
 		availableContext := extractAvailableContexts(diff, ownedIDs, podInstanceIDSet)
 
-		succCount, err := controllerutils.SlowStartBatch(diff, controllerutils.SlowStartInitialBatchSize, false, func(idx int, err error) error {
+		succCount, err := controllerutils.SlowStartBatch(diff, controllerutils.SlowStartInitialBatchSize, false, func(idx int, _ error) error {
 			availableIDContext := availableContext[idx]
 			// use revision recorded in Context
 			revision := updatedRevision

pkg/controllers/utils/expectations/active_expectation.go

@@ -96,7 +96,7 @@ func (ae *ActiveExpectations) expect(subject metav1.Object, kind ExpectedReosurc
 	}
 
 	if action == Update {
-		panic(fmt.Sprintf("update action is not supported by this method"))
+		panic("update action is not supported by this method")
 	}
 
 	key := fmt.Sprintf("%s/%s", subject.GetNamespace(), subject.GetName())
@@ -275,7 +275,7 @@ type ActiveExpectation struct {
 
 func (ae *ActiveExpectation) expect(kind ExpectedReosurceType, name string, action ActiveExpectationAction) error {
 	if action == Update {
-		panic(fmt.Sprintf("update action is not supported by this method"))
+		panic("update action is not supported by this method")
 	}
 
 	key := fmt.Sprintf("%s/%s", kind, name)
@@ -334,7 +334,7 @@ func (ae *ActiveExpectation) isSatisfied() (satisfied bool, err error) {
 				if satisfied {
 					ae.items.Delete(item)
 				} else if ae.recordTimestamp.Add(ExpectationsTimeout).Before(time.Now()) {
-					panic(fmt.Sprintf("expected panic for active expectation"))
+					panic("expected panic for active expectation")
 				}
 			}()
 

pkg/controllers/utils/podopslifecycle/utils.go

@@ -100,7 +100,7 @@ func Finish(c client.Client, adapter LifecycleAdapter, obj client.Object) (updat
 	operationType, hasType := checkOperationType(adapter, obj)
 
 	if hasType && operationType != adapter.GetType() {
-		err = fmt.Errorf("operatingID %s has invalid operationType %s", operatingID, operationType)
+		return false, fmt.Errorf("operatingID %s has invalid operationType %s", operatingID, operationType)
 	}
 
 	var needUpdate bool
@@ -126,7 +126,7 @@ func Finish(c client.Client, adapter LifecycleAdapter, obj client.Object) (updat
 
 func checkOperatingID(adapter LifecycleAdapter, obj client.Object) (val string, ok bool) {
 	labelID := fmt.Sprintf("%s/%s", v1alpha1.PodOperatingLabelPrefix, adapter.GetID())
-	val, ok = obj.GetLabels()[labelID]
+	_, ok = obj.GetLabels()[labelID]
 	return adapter.GetID(), ok
 }
 

pkg/controllers/utils/refmanager/ref_manager.go

@@ -20,7 +20,6 @@ package utils
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"sync"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -48,10 +47,6 @@ func NewRefManager(client client.Writer, selector *metav1.LabelSelector, owner m
 		return nil, err
 	}
 
-	ownerType := reflect.TypeOf(owner)
-	if ownerType.Kind() == reflect.Ptr {
-		ownerType = ownerType.Elem()
-	}
 	return &RefManager{
 		client:   client,
 		selector: s,

pkg/controllers/utils/revision/revision_manager.go

@@ -84,6 +84,9 @@ func controlledHistories(c client.Client, owner client.Object, labelSelector *me
 
 	// Use ControllerRefManager to adopt/orphan as needed.
 	cm, err := refmanagerutil.NewRefManager(c, labelSelector, owner, scheme)
+	if err != nil {
+		return nil, err
+	}
 	mts := make([]client.Object, len(histories.Items))
 	for i, pod := range histories.Items {
 		mts[i] = pod.DeepCopy()