From 56e7f45e6468d2a3a18f6c72ed39a2e4e1163c28 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Tue, 12 May 2026 13:15:25 +0000 Subject: [PATCH 1/5] Make possible to configure own vpc and subnet for cluster image build --- iac/provider-gcp/nomad-cluster-disk-image/Makefile | 5 +++-- iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl | 2 +- iac/provider-gcp/nomad-cluster-disk-image/variables.tf | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile index 89e3dd5338..0c4d9ee16d 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile +++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile @@ -1,7 +1,8 @@ ENV := $(shell cat ../../../.last_used_env || echo "not-set") -include ../../../.env.${ENV} -NETWORK_NAME := "e2b-build-cluster-disk-image" +PACKER_NETWORK_NAME ?= "e2b-build-cluster-disk-image" +PACKER_SUBNET_NAME ?= "e2b-build-cluster-disk-image-subnetwork" tf_vars := TF_VAR_gcp_project_id=$(GCP_PROJECT_ID) \ TF_VAR_gcp_region=$(GCP_REGION) \ @@ -13,7 +14,7 @@ init: build: terraform init -input=false -reconfigure -backend-config="bucket=${TERRAFORM_STATE_BUCKET}" $(tf_vars) terraform apply -auto-approve -input=false -compact-warnings - packer build -var "gcp_project_id=$(GCP_PROJECT_ID)" -var "gcp_zone=$(GCP_ZONE)" -var "network_name=$(NETWORK_NAME)" . + packer build -var "gcp_project_id=$(GCP_PROJECT_ID)" -var "gcp_zone=$(GCP_ZONE)" -var "network_name=$(PACKER_NETWORK_NAME)" -var "subnet_name=$(PACKER_NETWORK_NAME)" . format: packer fmt . diff --git a/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl b/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl index a593a123b1..aad6080b22 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/main.pkr.hcl @@ -28,7 +28,7 @@ source "googlecompute" "orch" { # Enable IAP for SSH network = var.network_name - subnetwork = "${var.network_name}-subnetwork" + subnetwork = var.subnet_name use_iap = true } diff --git a/iac/provider-gcp/nomad-cluster-disk-image/variables.tf b/iac/provider-gcp/nomad-cluster-disk-image/variables.tf index e63d0ede30..285f24c82f 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.tf +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.tf @@ -9,3 +9,7 @@ variable "gcp_region" { variable "network_name" { type = string } + +variable "subnet_name" { + type = string +} From 661843deebce68e977b86414d446d96086df34e0 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Tue, 12 May 2026 13:20:46 +0000 Subject: [PATCH 2/5] Use vars in tf --- iac/provider-gcp/nomad-cluster-disk-image/Makefile | 3 ++- iac/provider-gcp/nomad-cluster-disk-image/main.tf | 5 +++-- .../nomad-cluster-disk-image/variables.pkr.hcl | 7 ++++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile index 0c4d9ee16d..ac5b6c3e31 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile +++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile @@ -6,7 +6,8 @@ PACKER_SUBNET_NAME ?= "e2b-build-cluster-disk-image-subnetwork" tf_vars := TF_VAR_gcp_project_id=$(GCP_PROJECT_ID) \ TF_VAR_gcp_region=$(GCP_REGION) \ - TF_VAR_network_name=$(NETWORK_NAME) + TF_VAR_network_name=$(PACKER_NETWORK_NAME) \ + TF_VAR_subnet_name=$(PACKER_SUBNET_NAME) init: packer init -upgrade . diff --git a/iac/provider-gcp/nomad-cluster-disk-image/main.tf b/iac/provider-gcp/nomad-cluster-disk-image/main.tf index 4c628733c4..c807bf2b55 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/main.tf +++ b/iac/provider-gcp/nomad-cluster-disk-image/main.tf @@ -23,7 +23,7 @@ resource "google_compute_network" "packer_network" { resource "google_compute_subnetwork" "packer_subnetwork" { ip_cidr_range = "10.0.0.0/8" - name = "${var.network_name}-subnetwork" + name = var.subnet_name network = google_compute_network.packer_network.id log_config { @@ -48,4 +48,5 @@ resource "google_compute_firewall" "internal_remote_connection_firewall_ingress" direction = "INGRESS" # https://googlecloudplatform.github.io/iap-desktop/setup-iap/ source_ranges = ["35.235.240.0/20"] -} \ No newline at end of file +} + diff --git a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl index 4b49622af3..f4c5e0a3d8 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl @@ -10,6 +10,11 @@ variable "network_name" { type = string } +variable "subnet_name" { + type = string +} + + variable "prefix" { type = string default = "e2b-" @@ -39,4 +44,4 @@ variable "clickhouse_client_version" { variable "cni_plugin_version" { type = string default = "v1.6.2" -} \ No newline at end of file +} From d3cf149f9acd3084beb3404a901a5e80d51e35a9 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Tue, 12 May 2026 13:33:43 +0000 Subject: [PATCH 3/5] Update tf version --- iac/provider-gcp/nomad-cluster-disk-image/Makefile | 2 +- iac/provider-gcp/nomad-cluster-disk-image/main.tf | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile index ac5b6c3e31..d480e096b5 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile +++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile @@ -14,7 +14,7 @@ init: build: terraform init -input=false -reconfigure -backend-config="bucket=${TERRAFORM_STATE_BUCKET}" - $(tf_vars) terraform apply -auto-approve -input=false -compact-warnings + $(tf_vars) terraform apply -auto-approve -input=false -upgrade -compact-warnings packer build -var "gcp_project_id=$(GCP_PROJECT_ID)" -var "gcp_zone=$(GCP_ZONE)" -var "network_name=$(PACKER_NETWORK_NAME)" -var "subnet_name=$(PACKER_NETWORK_NAME)" . format: diff --git a/iac/provider-gcp/nomad-cluster-disk-image/main.tf b/iac/provider-gcp/nomad-cluster-disk-image/main.tf index c807bf2b55..b44e65e30e 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/main.tf +++ b/iac/provider-gcp/nomad-cluster-disk-image/main.tf @@ -1,8 +1,10 @@ terraform { - required_version = ">= 1.5.0, < 1.6.0" + required_version = ">= 1.7.0, < 1.8.0" + backend "gcs" { prefix = "terraform/cluster-disk-image/state" } + required_providers { google = { source = "hashicorp/google" @@ -49,4 +51,3 @@ resource "google_compute_firewall" "internal_remote_connection_firewall_ingress" # https://googlecloudplatform.github.io/iap-desktop/setup-iap/ source_ranges = ["35.235.240.0/20"] } - From c53c3624a8b6d3c3b4dbb206acc7c6fc066e8e8a Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Tue, 12 May 2026 13:58:12 +0000 Subject: [PATCH 4/5] Cleanup --- iac/provider-gcp/nomad-cluster-disk-image/Makefile | 4 ++-- iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile index d480e096b5..33e1701ff7 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile +++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile @@ -1,8 +1,8 @@ ENV := $(shell cat ../../../.last_used_env || echo "not-set") -include ../../../.env.${ENV} -PACKER_NETWORK_NAME ?= "e2b-build-cluster-disk-image" -PACKER_SUBNET_NAME ?= "e2b-build-cluster-disk-image-subnetwork" +PACKER_NETWORK_NAME ?= e2b-build-cluster-disk-image +PACKER_SUBNET_NAME ?= e2b-build-cluster-disk-image-subnetwork tf_vars := TF_VAR_gcp_project_id=$(GCP_PROJECT_ID) \ TF_VAR_gcp_region=$(GCP_REGION) \ diff --git a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl index f4c5e0a3d8..81363a6029 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl @@ -14,7 +14,6 @@ variable "subnet_name" { type = string } - variable "prefix" { type = string default = "e2b-" From 5bd605acc1f8c15440c65a1f8486666545945f0c Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Tue, 19 May 2026 09:26:23 +0000 Subject: [PATCH 5/5] Revert older tf version for now --- iac/provider-gcp/nomad-cluster-disk-image/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iac/provider-gcp/nomad-cluster-disk-image/main.tf b/iac/provider-gcp/nomad-cluster-disk-image/main.tf index b44e65e30e..e9b4b6ba0f 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/main.tf +++ b/iac/provider-gcp/nomad-cluster-disk-image/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.7.0, < 1.8.0" + required_version = ">= 1.5.0, < 1.6.0" backend "gcs" { prefix = "terraform/cluster-disk-image/state"