From 553fa1dc145dfd91906907ded37fb154c15be4ca Mon Sep 17 00:00:00 2001
From: Juan Celhay <jicelhay@google.com>
Date: Tue, 28 Jul 2026 15:08:26 -0400
Subject: [PATCH] Use environment custom worker pool for deploy step in cloud
 deploy (#3180)

---
 release/cloudbuild-clouddeploy.yaml     |  2 ++
 release/clouddeploy/crash-target.yaml   | 11 ++++++++++-
 release/clouddeploy/sandbox-target.yaml | 11 ++++++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/release/cloudbuild-clouddeploy.yaml b/release/cloudbuild-clouddeploy.yaml
index f099e0f5d..4d1fdb1ff 100644
--- a/release/cloudbuild-clouddeploy.yaml
+++ b/release/cloudbuild-clouddeploy.yaml
@@ -80,10 +80,12 @@ steps:
           artifact_storage=$(sed -n 's/^artifactStorage: //p' "$config_file")
           service_account=$(sed -n 's/^serviceAccount: //p' "$config_file")
           cluster_val=$(sed -n 's/^cluster: //p' "$config_file")
+          worker_pool=$(sed -n 's/^workerPool: //p' "$config_file")
           
           sed -i "s|artifactStorage: artifactStorage|artifactStorage: $artifact_storage|" "$target_file"
           sed -i "s|serviceAccount: serviceAccount|serviceAccount: $service_account|" "$target_file"
           sed -i "s|cluster: cluster|cluster: $cluster_val|" "$target_file"
+          sed -i "s|workerPool: workerPool|workerPool: $worker_pool|" "$target_file"
         fi
       fi
     done
diff --git a/release/clouddeploy/crash-target.yaml b/release/clouddeploy/crash-target.yaml
index 397997d9c..4263dadea 100644
--- a/release/clouddeploy/crash-target.yaml
+++ b/release/clouddeploy/crash-target.yaml
@@ -7,7 +7,6 @@ requireApproval: true
 executionConfigs:
 - usages:
   - RENDER
-  - DEPLOY
   - ANALYSIS
   - POSTDEPLOY
   executionTimeout: 3600s
@@ -16,6 +15,16 @@ executionConfigs:
     artifactStorage: artifactStorage
     # Placeholder: Replace with project number.
     serviceAccount: serviceAccount
+- usages:
+  - DEPLOY
+  executionTimeout: 3600s
+  privatePool:
+    # Placeholder: Replace with worker pool name.
+    workerPool: workerPool
+    # Placeholder: Replace with artifact bucket name.
+    artifactStorage: artifactStorage
+    # Placeholder: Replace with project number.
+    serviceAccount: serviceAccount
 gke:
   # Placeholder: Replace with project ID, location, and cluster name.
   cluster: cluster
diff --git a/release/clouddeploy/sandbox-target.yaml b/release/clouddeploy/sandbox-target.yaml
index 85867d947..79c01e525 100644
--- a/release/clouddeploy/sandbox-target.yaml
+++ b/release/clouddeploy/sandbox-target.yaml
@@ -6,7 +6,6 @@ requireApproval: true
 executionConfigs:
 - usages:
   - RENDER
-  - DEPLOY
   - ANALYSIS
   - POSTDEPLOY
   executionTimeout: 3600s
@@ -15,6 +14,16 @@ executionConfigs:
     artifactStorage: artifactStorage
     # Placeholder: Replace with project number.
     serviceAccount: serviceAccount
+- usages:
+  - DEPLOY
+  executionTimeout: 3600s
+  privatePool:
+    # Placeholder: Replace with worker pool name.
+    workerPool: workerPool
+    # Placeholder: Replace with artifact bucket name.
+    artifactStorage: artifactStorage
+    # Placeholder: Replace with project number.
+    serviceAccount: serviceAccount
 gke:
   # Placeholder: Replace with project ID, location, and cluster name.
   cluster: cluster