fix: gke e2e test issues (#859)

allen-stephen · web-flow · commit 7d288033c055 · 2026-03-05T10:46:48.000-06:00
diff --git a/agent_starter_pack/base_templates/_shared/deployment/terraform/build_triggers.tf b/agent_starter_pack/base_templates/_shared/deployment/terraform/build_triggers.tf
@@ -79,6 +79,10 @@ resource "google_cloudbuild_trigger" "cd_pipeline" {
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
     _CONTAINER_NAME                = var.project_name
     _ARTIFACT_REGISTRY_REPO_NAME   = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
+{%- elif cookiecutter.deployment_target == 'gke' %}
+    _CONTAINER_NAME                = var.project_name
+    _ARTIFACT_REGISTRY_REPO_NAME   = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
+    _GKE_CLUSTER_NAME              = "${var.project_name}-staging"
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
 {%- endif %}
 {%- if cookiecutter.data_ingestion and cookiecutter.datastore_type == "vertex_ai_vector_search" %}
@@ -125,6 +129,10 @@ resource "google_cloudbuild_trigger" "deploy_to_prod_pipeline" {
 {%- if cookiecutter.deployment_target == 'cloud_run' %}
     _CONTAINER_NAME              = var.project_name
     _ARTIFACT_REGISTRY_REPO_NAME = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
+{%- elif cookiecutter.deployment_target == 'gke' %}
+    _CONTAINER_NAME                = var.project_name
+    _ARTIFACT_REGISTRY_REPO_NAME   = resource.google_artifact_registry_repository.repo-artifacts-genai.repository_id
+    _GKE_CLUSTER_NAME              = "${var.project_name}-prod"
 {%- elif cookiecutter.deployment_target == 'agent_engine' %}
 {%- endif %}
 {%- if cookiecutter.data_ingestion and cookiecutter.datastore_type == "vertex_ai_vector_search" %}
diff --git a/agent_starter_pack/base_templates/_shared/deployment/terraform/storage.tf b/agent_starter_pack/base_templates/_shared/deployment/terraform/storage.tf
@@ -27,7 +27,7 @@ resource "google_storage_bucket" "logs_data_bucket" {
 
   depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]
 }
-{% if cookiecutter.deployment_target == 'cloud_run' %}
+{% if cookiecutter.deployment_target in ['cloud_run', 'gke'] %}
 resource "google_artifact_registry_repository" "repo-artifacts-genai" {
   location      = var.region
   repository_id = "${var.project_name}-repo"

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ resource "google_storage_bucket" "logs_data_bucket" {`
`27`	`27`
`28`	`28`	`depends_on = [resource.google_project_service.cicd_services, resource.google_project_service.deploy_project_services]`
`29`	`29`	`}`
`30`		`-{% if cookiecutter.deployment_target == 'cloud_run' %}`
	`30`	`+{% if cookiecutter.deployment_target in ['cloud_run', 'gke'] %}`
`31`	`31`	`resource "google_artifact_registry_repository" "repo-artifacts-genai" {`
`32`	`32`	`location = var.region`
`33`	`33`	`repository_id = "${var.project_name}-repo"`