test: add metrics e2e tests

kubernetes-sigs · Jan 9, 2025 · 9f77094 · 9f77094
1 parent bf4657a
commit 9f77094
Show file tree

Hide file tree

Showing 7 changed files with 530 additions and 32 deletions.
diff --git a/pkg/controller/core/localqueue_controller.go b/pkg/controller/core/localqueue_controller.go
@@ -183,6 +183,10 @@ func (r *LocalQueueReconciler) Update(e event.UpdateEvent) bool {
 	log := r.log.WithValues("localQueue", klog.KObj(newLq))
 	log.V(2).Info("Queue update event")
 
+	if features.Enabled(features.LocalQueueMetrics) {
+		updateLocalQueueResourceMetrics(newLq)
+	}
+
 	oldStopPolicy := ptr.Deref(oldLq.Spec.StopPolicy, kueue.None)
 	newStopPolicy := ptr.Deref(newLq.Spec.StopPolicy, kueue.None)
 
@@ -207,9 +211,6 @@ func (r *LocalQueueReconciler) Update(e event.UpdateEvent) bool {
 	}
 
 	r.queues.DeleteLocalQueue(oldLq)
-	if features.Enabled(features.LocalQueueMetrics) {
-		updateLocalQueueResourceMetrics(newLq)
-	}
 
 	return true
 }

diff --git a/test/e2e/config/common/controller_manager_config.yaml b/test/e2e/config/common/controller_manager_config.yaml
@@ -1,5 +1,7 @@
 apiVersion: config.kueue.x-k8s.io/v1beta1
 kind: Configuration
+metrics:
+  enableClusterQueueResources: true
 leaderElection:
   leaderElect: true
 controller:

diff --git a/test/e2e/config/common/manager_e2e_patch.yaml b/test/e2e/config/common/manager_e2e_patch.yaml
@@ -3,4 +3,4 @@
   value: IfNotPresent
 - op: add
   path: /spec/template/spec/containers/0/args/-
-  value: --feature-gates=MultiKueueBatchJobWithManagedBy=true,TopologyAwareScheduling=true
+  value: --feature-gates=MultiKueueBatchJobWithManagedBy=true,TopologyAwareScheduling=true,LocalQueueMetrics=true