review fixes

kubernetes-sigs · Nov 14, 2023 · 53a8d24 · 53a8d24
1 parent 3b15bd9
commit 53a8d24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/pkg/controller/core/core.go b/pkg/controller/core/core.go
@@ -61,15 +61,7 @@ func SetupControllers(mgr ctrl.Manager, qManager *queue.Manager, cc *cache.Cache
 	if err := cqRec.SetupWithManager(mgr); err != nil {
 		return "ClusterQueue", err
 	}
-	wlRec := NewWorkloadReconciler(
-		mgr.GetClient(),
-		qManager,
-		cc,
-		mgr.GetEventRecorderFor("workload-controller"),
-		WithWorkloadUpdateWatchers(qRec, cqRec),
-		WithPodsReadyTimeout(podsReadyTimeout(cfg)),
-	)
-	if err := wlRec.SetupWithManager(mgr); err != nil {
+	if err := NewWorkloadReconciler(mgr.GetClient(), qManager, cc, WithWorkloadUpdateWatchers(qRec, cqRec), WithPodsReadyTimeout(podsReadyTimeout(cfg))).SetupWithManager(mgr); err != nil {
 		return "Workload", err
 	}
 	return "", nil

diff --git a/pkg/controller/core/workload_controller.go b/pkg/controller/core/workload_controller.go
@@ -29,7 +29,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
@@ -94,12 +93,11 @@ type WorkloadReconciler struct {
 	queues           *queue.Manager
 	cache            *cache.Cache
 	client           client.Client
-	record           record.EventRecorder
 	watchers         []WorkloadUpdateWatcher
 	podsReadyTimeout *time.Duration
 }
 
-func NewWorkloadReconciler(client client.Client, queues *queue.Manager, cache *cache.Cache, record record.EventRecorder, opts ...Option) *WorkloadReconciler {
+func NewWorkloadReconciler(client client.Client, queues *queue.Manager, cache *cache.Cache, opts ...Option) *WorkloadReconciler {
 	options := defaultOptions
 	for _, opt := range opts {
 		opt(&options)
@@ -110,7 +108,6 @@ func NewWorkloadReconciler(client client.Client, queues *queue.Manager, cache *c
 		client:           client,
 		queues:           queues,
 		cache:            cache,
-		record:           record,
 		watchers:         options.watchers,
 		podsReadyTimeout: options.podsReadyTimeout,
 	}
@@ -219,11 +216,8 @@ func (r *WorkloadReconciler) reconcileSyncAdmissionChecks(ctx context.Context, w
 		log := ctrl.LoggerFrom(ctx)
 		log.V(3).Info("The workload needs admission checks updates", "clusterQueue", klog.KRef("", cqName), "admissionChecks", queueAdmissionChecks)
 		wl.Status.AdmissionChecks = newChecks
-		if err := r.client.Status().Update(ctx, wl); err != nil {
-			return true, client.IgnoreNotFound(err)
-		}
-		r.record.Eventf(wl, corev1.EventTypeNormal, "AdmissionChecksChanged", "Updated the list of admission checks for the workload, based on the clusterQueue %s", cqName)
-		return true, nil
+		err := r.client.Status().Update(ctx, wl)
+		return true, client.IgnoreNotFound(err)
 	}
 	return false, nil
 }

diff --git a/test/integration/controller/admissionchecks/provisioning/suite_test.go b/test/integration/controller/admissionchecks/provisioning/suite_test.go
@@ -55,7 +55,7 @@ func managerSetup(mgr manager.Manager, ctx context.Context) {
 	err = provisioning.SetupIndexer(ctx, mgr.GetFieldIndexer())
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 
-	reconciler := provisioning.NewController(mgr.GetClient(), mgr.GetEventRecorderFor("admission-checks-controller"))
+	reconciler := provisioning.NewController(mgr.GetClient(), mgr.GetEventRecorderFor("kueue-provisioning-request-controller"))
 	err = reconciler.SetupWithManager(mgr)
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 }