From e7c92a4d604a0b6b35c2ecdf3f2cad3c6451d08d Mon Sep 17 00:00:00 2001
From: Tom Martensen <tmartens@redhat.com>
Date: Mon, 27 Jul 2026 14:38:21 +0200
Subject: [PATCH] ROX-35590: Expose gcp-project as parameter for gke-default
 flavor

---
 chart/infra-server/static/flavors.yaml              | 13 +++++++++++++
 .../static/janitor-delete-gke-default.yaml          |  4 +++-
 chart/infra-server/static/test-gke-lite.yaml        |  6 ++++--
 chart/infra-server/static/workflow-gke-default.yaml |  7 ++++---
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/chart/infra-server/static/flavors.yaml b/chart/infra-server/static/flavors.yaml
index 644f65f3b..e1e646d32 100644
--- a/chart/infra-server/static/flavors.yaml
+++ b/chart/infra-server/static/flavors.yaml
@@ -184,6 +184,11 @@
       value: false
       kind: optional
 
+    - name: gcp-project
+      description: Google Cloud project to deploy infrastructure into.
+      value: acs-team-temp-dev
+      kind: optional
+
   artifacts:
     - name: kubeconfig
       description: Kube config for connecting to this cluster
@@ -1197,6 +1202,9 @@
     - name: gcp-zone
       description: Google Cloud zone to delete infrastructure from.
       value: us-central1-a
+    - name: gcp-project
+      description: Google Cloud project to delete infrastructure from.
+      value: acs-team-temp-dev
 
 - id: janitor-delete-openshift-4
   name: Janitor delete Openshift
@@ -1307,6 +1315,11 @@
       value: us-central1-a
       kind: optional
 
+    - name: gcp-project
+      description: Google Cloud project to deploy infrastructure into.
+      value: acs-team-temp-dev
+      kind: optional
+
   artifacts:
     - name: kubeconfig
       description: Kube config for connecting to this cluster
diff --git a/chart/infra-server/static/janitor-delete-gke-default.yaml b/chart/infra-server/static/janitor-delete-gke-default.yaml
index 394a60d3a..1f1275aae 100644
--- a/chart/infra-server/static/janitor-delete-gke-default.yaml
+++ b/chart/infra-server/static/janitor-delete-gke-default.yaml
@@ -9,6 +9,8 @@ spec:
       - name: name
       - name: gcp-zone
         value: ""
+      - name: gcp-project
+        value: ""
 
   volumes:
     - name: credentials
@@ -31,7 +33,7 @@ spec:
         args:
           - destroy
           - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
-          - --gcp-project=acs-team-temp-dev
+          - --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
           - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials
diff --git a/chart/infra-server/static/test-gke-lite.yaml b/chart/infra-server/static/test-gke-lite.yaml
index a7b1e00ed..289bca820 100644
--- a/chart/infra-server/static/test-gke-lite.yaml
+++ b/chart/infra-server/static/test-gke-lite.yaml
@@ -18,6 +18,8 @@ spec:
         value: ""
       - name: gcp-zone
         value: ""
+      - name: gcp-project
+        value: ""
 
   volumes:
     - name: credentials
@@ -72,7 +74,7 @@ spec:
           - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
           - --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
           - --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
-          - --gcp-project=acs-team-temp-dev
+          - --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
           - --creation-source=infra
           - --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
           - --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
@@ -95,7 +97,7 @@ spec:
         args:
           - destroy
           - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
-          - --gcp-project=acs-team-temp-dev
+          - --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
           - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials
diff --git a/chart/infra-server/static/workflow-gke-default.yaml b/chart/infra-server/static/workflow-gke-default.yaml
index 4be3a1203..0be1d7c00 100644
--- a/chart/infra-server/static/workflow-gke-default.yaml
+++ b/chart/infra-server/static/workflow-gke-default.yaml
@@ -20,7 +20,8 @@ spec:
         value: ""
       - name: set-ssd-storage-default
         value: ""
-
+      - name: gcp-project
+        value: ""
   volumes:
     - name: credentials
       secret:
@@ -75,7 +76,7 @@ spec:
           - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
           - --nodes={{ "{{" }}workflow.parameters.nodes{{ "}}" }}
           - --machine-type={{ "{{" }}workflow.parameters.machine-type{{ "}}" }}
-          - --gcp-project=acs-team-temp-dev
+          - --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
           - --creation-source=infra
           - --k8s-version={{ "{{" }}workflow.parameters.k8s-version{{ "}}" }}
           - --pod-security-policy={{ "{{" }}workflow.parameters.pod-security-policy{{ "}}" }}
@@ -99,7 +100,7 @@ spec:
         args:
           - destroy
           - --name={{ "{{" }}workflow.parameters.name{{ "}}" }}
-          - --gcp-project=acs-team-temp-dev
+          - --gcp-project={{ "{{" }}workflow.parameters.gcp-project{{ "}}" }}
           - --gcp-zone={{ "{{" }}workflow.parameters.gcp-zone{{ "}}" }}
         volumeMounts:
           - name: credentials