test(TestPromClientControllerSync_EventHandler): have prometheus client tests build an entire descheduler as well

Author: ingvagabund

pkg/descheduler/descheduler_test.go

@@ -2074,28 +2074,9 @@ func TestPromClientControllerSync_ClientCreation(t *testing.T) {
 }
 
 func TestPromClientControllerSync_EventHandler(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	setup := setupPromClientControllerTest(ctx, nil, newPrometheusConfig())
-
-	// Track created clients to verify different instances
-	var createdClients []promapi.Client
-	var createdClientsMu sync.Mutex
-	setup.ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
-		client := &mockPrometheusClient{name: "client-" + token}
-		createdClientsMu.Lock()
-		createdClients = append(createdClients, client)
-		createdClientsMu.Unlock()
-		return client, &http.Transport{}, nil
-	}
-
-	// Start the reconciler to process queue items
-	go setup.ctrl.runAuthenticationSecretReconciler(ctx)
-
 	testCases := []struct {
 		name                             string
-		operation                        func() error
+		operation                        func(ctx context.Context, fakeClient *fakeclientset.Clientset) error
 		processItem                      bool
 		expectedPromClientSet            bool
 		expectedCreatedClientsCount      int
@@ -2106,7 +2087,7 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 		// Check initial conditions
 		{
 			name:                        "no secret initially",
-			operation:                   func() error { return nil },
+			operation:                   func(ctx context.Context, fakeClient *fakeclientset.Clientset) error { return nil },
 			processItem:                 false,
 			expectedPromClientSet:       false,
 			expectedCreatedClientsCount: 0,
@@ -2115,9 +2096,9 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 		// Change conditions
 		{
 			name: "add secret",
-			operation: func() error {
+			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
 				secret := newPrometheusAuthSecret(withToken("token-1"))
-				_, err := setup.fakeClient.CoreV1().Secrets(secret.Namespace).Create(ctx, secret, metav1.CreateOptions{})
+				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Create(ctx, secret, metav1.CreateOptions{})
 				return err
 			},
 			processItem:                 true,
@@ -2127,9 +2108,9 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 		},
 		{
 			name: "update secret",
-			operation: func() error {
+			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
 				secret := newPrometheusAuthSecret(withToken("token-2"))
-				_, err := setup.fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
+				_, err := fakeClient.CoreV1().Secrets(secret.Namespace).Update(ctx, secret, metav1.UpdateOptions{})
 				return err
 			},
 			processItem:                 true,
@@ -2140,9 +2121,9 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 		},
 		{
 			name: "delete secret",
-			operation: func() error {
+			operation: func(ctx context.Context, fakeClient *fakeclientset.Clientset) error {
 				secret := newPrometheusAuthSecret(withToken("token-2"))
-				return setup.fakeClient.CoreV1().Secrets(secret.Namespace).Delete(ctx, secret.Name, metav1.DeleteOptions{})
+				return fakeClient.CoreV1().Secrets(secret.Namespace).Delete(ctx, secret.Name, metav1.DeleteOptions{})
 			},
 			processItem:                      true,
 			expectedPromClientSet:            false,
@@ -2152,9 +2133,61 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 		},
 	}
 
+	for _, setupMode := range []struct {
+		name string
+		init func(t *testing.T, ctx context.Context) (ctrl *promClientController, fakeClient *fakeclientset.Clientset)
+	}{
+		{
+			name: "running with prom reconciler directly",
+			init: func(t *testing.T, ctx context.Context) (ctrl *promClientController, fakeClient *fakeclientset.Clientset) {
+				setup := setupPromClientControllerTest(ctx, nil, newPrometheusConfig())
+
+				// Start the reconciler to process queue items
+				go setup.ctrl.runAuthenticationSecretReconciler(ctx)
+
+				return setup.ctrl, setup.fakeClient
+			},
+		},
+		{
+			name: "running with full descheduler",
+			init: func(t *testing.T, ctx context.Context) (ctrl *promClientController, fakeClient *fakeclientset.Clientset) {
+				prometheusConfig := newPrometheusConfig()
+				deschedulerPolicy := &api.DeschedulerPolicy{
+					MetricsProviders: []api.MetricsProvider{
+						{
+							Source:     api.PrometheusMetrics,
+							Prometheus: prometheusConfig,
+						},
+					},
+				}
+
+				_, descheduler, _, client := initDescheduler(t, ctx, initFeatureGates(), deschedulerPolicy, nil, false)
+				// The reconciler is already started by initDescheduler via bootstrapDescheduler
+
+				return descheduler.promClientCtrl, client
+			},
+		},
+	} {
+		t.Run(setupMode.name, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(context.Background())
+			defer cancel()
+
+			ctrl, fakeClient := setupMode.init(t, ctx)
+
+			// Track created clients to verify different instances
+			var createdClients []promapi.Client
+			var createdClientsMu sync.Mutex
+			ctrl.createPrometheusClient = func(url, token string) (promapi.Client, *http.Transport, error) {
+				client := &mockPrometheusClient{name: "client-" + token}
+				createdClientsMu.Lock()
+				createdClients = append(createdClients, client)
+				createdClientsMu.Unlock()
+				return client, &http.Transport{}, nil
+			}
+
 			for _, tc := range testCases {
 				t.Run(tc.name, func(t *testing.T) {
-					if err := tc.operation(); err != nil {
+					if err := tc.operation(ctx, fakeClient); err != nil {
 						t.Fatalf("Failed to execute operation: %v", err)
 					}
 
@@ -2163,11 +2196,11 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 						err := wait.PollUntilContextTimeout(ctx, 10*time.Millisecond, 2*time.Second, true, func(ctx context.Context) (bool, error) {
 							// Check if all expected conditions are met
 							if tc.expectedPromClientSet {
-								if setup.ctrl.promClient == nil {
+								if ctrl.promClient == nil {
 									return false, nil
 								}
 							} else {
-								if setup.ctrl.promClient != nil {
+								if ctrl.promClient != nil {
 									return false, nil
 								}
 							}
@@ -2179,12 +2212,12 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 								return false, nil
 							}
 
-							if setup.ctrl.currentPrometheusAuthToken != tc.expectedCurrentToken {
+							if ctrl.currentPrometheusAuthToken != tc.expectedCurrentToken {
 								return false, nil
 							}
 
 							if tc.expectedPreviousTransportCleared {
-								if setup.ctrl.previousPrometheusClientTransport != nil {
+								if ctrl.previousPrometheusClientTransport != nil {
 									return false, nil
 								}
 							}
@@ -2202,12 +2235,12 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 
 					// Validate post-conditions
 					if tc.expectedPromClientSet {
-						if setup.ctrl.promClient == nil {
+						if ctrl.promClient == nil {
 							t.Error("Expected prometheus client to be set, but it was nil")
 						}
 					} else {
-						if setup.ctrl.promClient != nil {
-							t.Errorf("Expected prometheus client to be nil, but got: %v", setup.ctrl.promClient)
+						if ctrl.promClient != nil {
+							t.Errorf("Expected prometheus client to be nil, but got: %v", ctrl.promClient)
 						}
 					}
 
@@ -2218,12 +2251,12 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 						t.Errorf("Expected %d clients created, but got %d", tc.expectedCreatedClientsCount, len(createdClients))
 					}
 
-					if setup.ctrl.currentPrometheusAuthToken != tc.expectedCurrentToken {
-						t.Errorf("Expected current token to be %q, got %q", tc.expectedCurrentToken, setup.ctrl.currentPrometheusAuthToken)
+					if ctrl.currentPrometheusAuthToken != tc.expectedCurrentToken {
+						t.Errorf("Expected current token to be %q, got %q", tc.expectedCurrentToken, ctrl.currentPrometheusAuthToken)
 					}
 
 					if tc.expectedPreviousTransportCleared {
-						if setup.ctrl.previousPrometheusClientTransport != nil {
+						if ctrl.previousPrometheusClientTransport != nil {
 							t.Error("Expected previous transport to be cleared, but it was set")
 						}
 					}
@@ -2237,6 +2270,8 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
 					}
 				})
 			}
+		})
+	}
 }
 
 func TestReconcileInClusterSAToken(t *testing.T) {