update dependencies (#6267)

Signed-off-by: hongming <coder.scala@gmail.com>

pkg/controller/application/apprelease_controller.go

@@ -97,7 +97,9 @@ func (r *AppReleaseReconciler) SetupWithManager(mgr *controller.Manager) error {
 			builder.WithPredicates(DeletePredicate{}),
 		).
 		WithEventFilter(IgnoreAnnotationChangePredicate{AnnotationKey: appv2.TimeoutRecheck}).
-		For(&appv2.ApplicationRelease{}).Complete(r)
+		For(&appv2.ApplicationRelease{}).
+		Named(helminstallerController).
+		Complete(r)
 }
 
 func (r *AppReleaseReconciler) mapper(ctx context.Context, o client.Object) (requests []reconcile.Request) {

pkg/controller/application/appversion_contrlller.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	appVersionController = "appversion-controller"
+	appVersionController = "appversion"
 )
 
 var _ reconcile.Reconciler = &AppVersionReconciler{}

pkg/controller/application/helm_repo_controller.go

@@ -51,7 +51,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/simple/client/application"
 )
 
-const helmRepoController = "helmrepo-controller"
+const helmRepoController = "helmrepo"
 
 var _ reconcile.Reconciler = &RepoReconciler{}
 var _ kscontroller.Controller = &RepoReconciler{}
@@ -104,6 +104,7 @@ func (r *RepoReconciler) SetupWithManager(mgr *kscontroller.Manager) (err error)
 			builder.WithPredicates(DeletePredicate{}),
 		).
 		For(&appv2.Repo{}).
+		Named(helmRepoController).
 		Complete(r)
 }
 

pkg/controller/cluster/cluster_controller.go

@@ -137,6 +137,7 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 2,
 		}).
+		Named(controllerName).
 		Complete(r)
 }
 

pkg/controller/clusterlabel/clusterlabel_controller.go

@@ -123,5 +123,6 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 				predicate.ResourceVersionChangedPredicate{},
 			),
 		).
+		Named(r.Name()).
 		Complete(r)
 }

pkg/controller/job/job_controller.go

@@ -54,6 +54,7 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 2,
 		}).
+		Named(controllerName).
 		Complete(r)
 }
 

pkg/controller/k8sapplication/k8sapplication_controller.go

@@ -9,6 +9,9 @@ import (
 	"context"
 	"fmt"
 
+	"sigs.k8s.io/controller-runtime/pkg/event"
+	"sigs.k8s.io/controller-runtime/pkg/predicate"
+
 	v1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	networkv1 "k8s.io/api/networking/v1"
@@ -28,9 +31,7 @@ import (
 	appv1beta1 "sigs.k8s.io/application/api/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
@@ -42,7 +43,7 @@ const controllerName = "k8sapplication"
 var _ kscontroller.Controller = &Reconciler{}
 var _ reconcile.Reconciler = &Reconciler{}
 
-// Reconciler reconciles a Application object
+// Reconciler reconciles an Application object
 type Reconciler struct {
 	client.Client
 	Mapper              meta.RESTMapper
@@ -81,16 +82,14 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 	}
 
 	for _, s := range sources {
-		// Watch for changes to Application
-		err = c.Watch(
-			source.Kind(mgr.GetCache(), s),
-			handler.EnqueueRequestsFromMapFunc(
-				func(ctx context.Context, obj client.Object) []reconcile.Request {
-					return []reconcile.Request{{NamespacedName: types.NamespacedName{
-						Name:      GetApplictionName(obj.GetLabels()),
-						Namespace: obj.GetNamespace()}}}
-				}),
-			predicate.Funcs{
+		h := handler.EnqueueRequestsFromMapFunc(
+			func(ctx context.Context, obj client.Object) []reconcile.Request {
+				return []reconcile.Request{{NamespacedName: types.NamespacedName{
+					Name:      GetApplictionName(obj.GetLabels()),
+					Namespace: obj.GetNamespace()}}}
+			})
+		p := predicate.GenerationChangedPredicate{
+			TypedFuncs: predicate.Funcs{
 				UpdateFunc: func(e event.UpdateEvent) bool {
 					return isApp(e.ObjectOld, e.ObjectOld)
 				},
@@ -100,7 +99,10 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 				DeleteFunc: func(e event.DeleteEvent) bool {
 					return isApp(e.Object)
 				},
-			})
+			},
+		}
+		// Watch for changes to Application
+		err = c.Watch(source.Kind(mgr.GetCache(), s, h, p))
 		if err != nil {
 			return err
 		}
@@ -249,7 +251,7 @@ func (r *Reconciler) setOwnerRefForResources(ctx context.Context, ownerRef metav
 	return nil
 }
 
-func (r *Reconciler) objectStatuses(ctx context.Context, resources []*unstructured.Unstructured, errs *[]error) []appv1beta1.ObjectStatus {
+func (r *Reconciler) objectStatuses(_ context.Context, resources []*unstructured.Unstructured, errs *[]error) []appv1beta1.ObjectStatus {
 	var objectStatuses []appv1beta1.ObjectStatus
 	for _, resource := range resources {
 		os := appv1beta1.ObjectStatus{

pkg/controller/ksserviceaccount/pod_injector.go

@@ -62,7 +62,7 @@ type PodInjector struct {
 	client.Client
 
 	Log     logr.Logger
-	Decoder *admission.Decoder
+	Decoder admission.Decoder
 	tls     bool
 }
 

pkg/controller/ksserviceaccount/serviceaccount_controller.go

@@ -61,6 +61,7 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 				predicate.ResourceVersionChangedPredicate{},
 			),
 		).
+		Named(controllerName).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: 2,
 		}).

pkg/controller/quota/resourcequota_controller.go

@@ -83,7 +83,7 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 		}).
 		For(&quotav1alpha2.ResourceQuota{}).
 		WithEventFilter(predicate.GenerationChangedPredicate{
-			Funcs: predicate.Funcs{
+			TypedFuncs: predicate.Funcs{
 				UpdateFunc: func(e event.UpdateEvent) bool {
 					oldQuota := e.ObjectOld.(*quotav1alpha2.ResourceQuota)
 					newQuota := e.ObjectNew.(*quotav1alpha2.ResourceQuota)
@@ -101,12 +101,11 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 		&corev1.Service{},
 		&corev1.PersistentVolumeClaim{},
 	}
+
 	realClock := clock.RealClock{}
 	for _, resource := range resources {
-		if err = c.Watch(
-			source.Kind(mgr.GetCache(), resource),
-			handler.EnqueueRequestsFromMapFunc(r.mapper),
-			predicate.Funcs{
+		p := predicate.GenerationChangedPredicate{
+			TypedFuncs: predicate.Funcs{
 				GenericFunc: func(e event.GenericEvent) bool {
 					return false
 				},
@@ -133,7 +132,9 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 				DeleteFunc: func(e event.DeleteEvent) bool {
 					return true
 				},
-			}); err != nil {
+			},
+		}
+		if err = c.Watch(source.Kind(mgr.GetCache(), resource, handler.EnqueueRequestsFromMapFunc(r.mapper), p)); err != nil {
 			return err
 		}
 	}
@@ -171,7 +172,7 @@ func (r *Reconciler) mapper(ctx context.Context, h client.Object) []reconcile.Re
 
 func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := r.logger.WithValues("resourcequota", req.NamespacedName)
-	rootCtx := context.TODO()
+	rootCtx := klog.NewContext(ctx, logger)
 	resourceQuota := &quotav1alpha2.ResourceQuota{}
 	if err := r.Get(rootCtx, req.NamespacedName, resourceQuota); err != nil {
 		return ctrl.Result{}, client.IgnoreNotFound(err)

pkg/controller/quota/resourcequota_webhook.go

@@ -40,7 +40,7 @@ const (
 type ResourceQuotaAdmission struct {
 	client client.Client
 
-	decoder *webhook.AdmissionDecoder
+	decoder webhook.AdmissionDecoder
 
 	lockFactory LockFactory
 
@@ -117,8 +117,8 @@ func (r *ResourceQuotaAdmission) lockAquisition(quotas []corev1.ResourceQuota) f
 
 	// acquire the locks in alphabetical order because I'm too lazy to think of something clever
 	sort.Sort(ByName(quotas))
-	for _, quota := range quotas {
-		lock := r.lockFactory.GetLock(string(quota.UID))
+	for _, q := range quotas {
+		lock := r.lockFactory.GetLock(string(q.UID))
 		lock.Lock()
 		locks = append(locks, lock)
 	}

pkg/controller/rolebinding/rolebinding_controller.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	controllerName = "rolebinding-controller"
+	controllerName = "rolebinding"
 	roleBindingRef = "iam.kubesphere.io/rolebinding-ref"
 )
 

pkg/controller/secret/serviceaccount_secret_controller.go

@@ -58,6 +58,7 @@ func (r *ServiceAccountSecretReconciler) SetupWithManager(mgr *kscontroller.Mana
 		ControllerManagedBy(mgr).
 		For(&v1.Secret{}).
 		WithEventFilter(predicate.ResourceVersionChangedPredicate{}).
+		Named(r.Name()).
 		Complete(r)
 }
 

pkg/controller/storageclass/storageclass_controller.go

@@ -107,7 +107,8 @@ func (r *Reconciler) SetupWithManager(mgr *kscontroller.Manager) error {
 			builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
 		).
 		WithOptions(controller.Options{MaxConcurrentReconciles: 2}).
-		Named(controllerName).Complete(r)
+		Named(controllerName).
+		Complete(r)
 }
 
 // When creating a new storage class, the controller will create a new storage capability object.