Fix E2E deploy timeout caused by reconcile race in kpt live apply (#1080)

* Fix E2E deploy timeout caused by CRD/instance reconcile race in kpt live apply

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

* Address review comments

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

---------

Signed-off-by: Aravindhan Ayyanathan <aravindhan.a@est.tech>

Author: aravindtga

make/deploy.mk

@@ -105,6 +105,9 @@ run-in-kind-db-cache-no-git-push-drafts: load-images-to-kind deployment-config d
 
 .PHONY: destroy
 destroy:## Deletes all porch resources installed by the last run-in-kind-* command
+	@if [ -d "$(DEPLOYPORCHCONFIGDIR)-post" ]; then \
+		kubectl delete -f "$(DEPLOYPORCHCONFIGDIR)-post/" --ignore-not-found; \
+	fi
 	kpt live destroy $(DEPLOYPORCHCONFIGDIR)
 
 .PHONY: deployment-config 
@@ -137,6 +140,9 @@ deploy-current-config:## Deploy the configuration that is currently in $(DEPLOYP
 	@if [ "$(SKIP_CONTROLLER_BUILD)" != "true" ]; then \
 		kubectl rollout status deployment porch-controllers --namespace porch-system --timeout=180s; \
 	fi
+	@if [ -d "$(DEPLOYPORCHCONFIGDIR)-post" ]; then \
+		kubectl apply --server-side --force-conflicts -f "$(DEPLOYPORCHCONFIGDIR)-post/"; \
+	fi
 	@echo "Done."
 
 .PHONY: reload-function-runner

scripts/create-deployment-blueprint.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2022-2025 The kpt Authors
+# Copyright 2022-2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -357,6 +357,13 @@ function main() {
 
   # Porch Deployment Config
   cp ${PORCH_DIR}/deployments/porch/*.yaml "${PORCH_DIR}/deployments/porch/Kptfile" "${DESTINATION}"
+
+  # Move FunctionConfig/ServiceTemplate CR instances to a separate post-deploy directory.
+  # These are applied after the main deployment rollout checks pass to avoid kpt live apply reconcile timeouts
+  # caused by applying a CRD and its instances in the same operation.
+  rm -rf "${DESTINATION}-post"
+  mkdir -p "${DESTINATION}-post"
+  mv "${DESTINATION}/22-function-templates.yaml" "${DESTINATION}/23-function-configurations.yaml" "${DESTINATION}-post/"
   # Copy Porch controller manager rbac
   cp ${PORCH_DIR}/controllers/config/rbac/role.yaml "${DESTINATION}/9-porch-controller-clusterrole.yaml"
 

scripts/create-deployment-config.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2025 The kpt Authors
+# Copyright 2025-2026 The kpt Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ source "$(dirname "$0")/common.sh"
 
 echo "Creating deployment configuration..."
 
-rm -rf "${DEPLOYPORCHCONFIGDIR}" || true
+rm -rf "${DEPLOYPORCHCONFIGDIR}" "${DEPLOYPORCHCONFIGDIR}-post" || true
 mkdir -p "${DEPLOYPORCHCONFIGDIR}"
 
 ./scripts/create-deployment-blueprint.sh \

scripts/create-deployment-kpt.sh

@@ -118,6 +118,11 @@ function deploy-porch-dev-pkg {
   kpt fn render ${DESTINATION}/porch
   kpt live init ${DESTINATION}/porch
   kpt live apply ${DESTINATION}/porch
+  # Apply CRD instances after the main deployment to avoid reconcile timeouts
+  # caused by applying a CRD and its instances in the same operation.
+  if [ -d "${DESTINATION}/porch-post" ]; then
+    kubectl apply --server-side --force-conflicts -f "${DESTINATION}/porch-post/"
+  fi
 }
 
 function load-custom-images {
@@ -166,6 +171,16 @@ for resource in ctx.resource_list["items"]:
   "${WRAPPER_SERVER_IMAGE}"
 
   echo "Deploying porch with newly built images..."
+  # Move FunctionConfig/ServiceTemplate CR instances to a separate post-deploy directory.
+  # These are applied after the main deployment to avoid kpt live apply reconcile timeouts
+  # caused by applying a CRD and its instances in the same operation.
+  rm -rf "${DESTINATION}/porch-post"
+  mkdir -p "${DESTINATION}/porch-post"
+  for f in "${DESTINATION}/porch/22-function-templates.yaml" "${DESTINATION}/porch/23-function-configurations.yaml"; do
+    if [ -f "$f" ]; then
+      mv "$f" "${DESTINATION}/porch-post/"
+    fi
+  done
   deploy-porch-dev-pkg
 
   echo