fix e2e failed

Author: 玖宇

internal/controller/workloads/discovery_config_mode_test.go

@@ -30,7 +30,7 @@ func TestEnsureDiscoveryConfigMode(t *testing.T) {
 
 	tests := []testCase{
 		{
-			name: "missing annotation with legacy role configmap should set legacy mode and requeue",
+			name: "missing annotation with legacy role configmap should set legacy mode without requeue",
 			buildExtraObjects: func(rbg *workloadsv1alpha1.RoleBasedGroup) []runtime.Object {
 				return []runtime.Object{
 					&corev1.ConfigMap{
@@ -41,13 +41,13 @@ func TestEnsureDiscoveryConfigMode(t *testing.T) {
 					},
 				}
 			},
-			wantRequeue:        true,
+			wantRequeue:        false,
 			wantMode:           workloadsv1alpha1.LegacyDiscoveryConfigMode,
 			wantModeAnnotation: true,
 		},
 		{
-			name:               "missing annotation without legacy signal should set refine mode and requeue",
-			wantRequeue:        true,
+			name:               "missing annotation without legacy signal should set refine mode without requeue",
+			wantRequeue:        false,
 			wantMode:           workloadsv1alpha1.RefineDiscoveryConfigMode,
 			wantModeAnnotation: true,
 		},

internal/controller/workloads/rolebasedgroup_controller.go

@@ -273,7 +273,7 @@ func (r *RoleBasedGroupReconciler) ensureDiscoveryConfigMode(
 		return false, nil
 	}
 
-	// determine mode, update annotation and then requeue
+	// determine mode, update annotation
 	legacy, err := r.shouldUseLegacyDiscoveryConfig(ctx, rbg)
 	if err != nil {
 		return true, err
@@ -291,7 +291,9 @@ func (r *RoleBasedGroupReconciler) ensureDiscoveryConfigMode(
 	}
 
 	log.FromContext(ctx).Info("Initialized discovery config mode", "mode", mode)
-	return true, nil
+	// Don't requeue here - continue to reconcile ConfigMap and workloads in the same loop
+	// to avoid race condition where workload is created before ConfigMap exists
+	return false, nil
 }
 
 func (r *RoleBasedGroupReconciler) shouldUseLegacyDiscoveryConfig(