fix e2e tests

Signed-off-by: Karol Szwaj <karol.szwaj@gmail.com>

On-behalf-of: @SAP karol.szwaj@sap.com

Author: cnvergence

backend/http/handler.go

@@ -456,7 +456,8 @@ func (h *handler) handleBind(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Resolve the UI sentinel to a real identity derived from the authenticated session.
-	if identity == auth.UIIdentity {
+	isUIFlow := identity == auth.UIIdentity
+	if isUIFlow {
 		identity = state.Token.Issuer + "/" + state.Token.Subject
 		logger.Info("Resolved ui-identity from session", "identity", identity)
 	}
@@ -499,20 +500,24 @@ func (h *handler) handleBind(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	// Create the APIServiceExportRequest on the provider cluster and wait for reconciliation.
-	// This ensures the binding is fully set up server-side for both CLI and UI flows.
-	exportRequest, err := h.kubeManager.CreateAPIServiceExportRequest(
-		r.Context(),
-		params.ClusterID,
-		handleResult.Namespace,
-		bindRequest.Name,
-		request.Spec,
-	)
-	if err != nil {
-		logger.Error(err, "failed to create APIServiceExportRequest")
-		statusCode, code, details := mapErrorToCode(err)
-		writeErrorResponse(w, statusCode, code, "Failed to create API service export request", details)
-		return
+	// For UI-only flow, create the APIServiceExportRequest on the provider cluster
+	// and wait for reconciliation. In CLI flow the konnector handles this instead.
+	var exportRequestName string
+	if isUIFlow {
+		exportRequest, err := h.kubeManager.CreateAPIServiceExportRequest(
+			r.Context(),
+			params.ClusterID,
+			handleResult.Namespace,
+			bindRequest.Name,
+			request.Spec,
+		)
+		if err != nil {
+			logger.Error(err, "failed to create APIServiceExportRequest")
+			statusCode, code, details := mapErrorToCode(err)
+			writeErrorResponse(w, statusCode, code, "Failed to create API service export request", details)
+			return
+		}
+		exportRequestName = exportRequest.Name
 	}
 
 	// callback response
@@ -537,7 +542,7 @@ func (h *handler) handleBind(w http.ResponseWriter, r *http.Request) {
 		Kubeconfig:        handleResult.Kubeconfig,
 		Requests:          []runtime.RawExtension{{Raw: requestBytes}},
 		ProviderNamespace: handleResult.Namespace,
-		BindingName:       exportRequest.Name,
+		BindingName:       exportRequestName,
 	}
 
 	payload, err := json.Marshal(&response)

backend/kubernetes/manager.go

@@ -215,16 +215,24 @@ func (m *Manager) CreateAPIServiceExportRequest(
 	logger = logger.WithValues("createdName", createdName)
 	logger.Info("Created APIServiceExportRequest, waiting for reconciliation")
 
-	// Poll until reconciled
+	// Poll until reconciled. The client reads from cache, so the object may not
+	// be visible immediately after creation. Tolerate NotFound for an initial
+	// grace period before treating it as a real deletion.
 	var result *kubebindv1alpha2.APIServiceExportRequest
-	if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 60*time.Second, true, func(ctx context.Context) (bool, error) {
+	seenOnce := false
+	if err := wait.PollUntilContextTimeout(ctx, 1*time.Second, 60*time.Second, false, func(ctx context.Context) (bool, error) {
 		req := &kubebindv1alpha2.APIServiceExportRequest{}
 		if err := c.Get(ctx, types.NamespacedName{Namespace: namespace, Name: createdName}, req); err != nil {
 			if errors.IsNotFound(err) {
-				return false, fmt.Errorf("APIServiceExportRequest %s was deleted", createdName)
+				if seenOnce {
+					return false, fmt.Errorf("APIServiceExportRequest %s was deleted", createdName)
+				}
+				// Cache hasn't synced yet — keep polling.
+				return false, nil
 			}
 			return false, err
 		}
+		seenOnce = true
 		if req.Status.Phase == kubebindv1alpha2.APIServiceExportRequestPhaseSucceeded {
 			result = req
 			return true, nil