From a6f5950c9a309b2d62ff7a431c1c2c0e286f7b93 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Sat, 30 May 2026 10:02:40 +0000 Subject: [PATCH 1/4] Unify packer envs naming --- iac/provider-aws/nomad-cluster-disk-image/Makefile | 6 +++--- iac/provider-gcp/nomad-cluster-disk-image/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/iac/provider-aws/nomad-cluster-disk-image/Makefile b/iac/provider-aws/nomad-cluster-disk-image/Makefile index 9845134b67..48248140a2 100644 --- a/iac/provider-aws/nomad-cluster-disk-image/Makefile +++ b/iac/provider-aws/nomad-cluster-disk-image/Makefile @@ -6,11 +6,11 @@ init: build: packer build \ - $(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \ - $(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \ + $(if $(PACKER_CONSUL_VERSION),-var "consul_version=$(PACKER_CONSUL_VERSION)") \ + $(if $(PACKER_NOMAD_VERSION),-var "nomad_version=$(PACKER_NOMAD_VERSION)") \ $(if $(PACKER_VPC_ID),-var "vpc_id=$(PACKER_VPC_ID)") \ $(if $(PACKER_SUBNET_ID),-var "subnet_id=$(PACKER_SUBNET_ID)") \ - $(if $(SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(SOURCE_AMI_FILTER_NAME)") \ + $(if $(PACKER_SOURCE_AMI_FILTER_NAME),-var "source_ami_filter_name=$(PACKER_SOURCE_AMI_FILTER_NAME)") \ -var "prefix=$(PREFIX)" \ -var "aws_region=$(AWS_REGION)" \ -var "aws_profile=$(AWS_PROFILE)" \ diff --git a/iac/provider-gcp/nomad-cluster-disk-image/Makefile b/iac/provider-gcp/nomad-cluster-disk-image/Makefile index fa882a5367..157565791d 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/Makefile +++ b/iac/provider-gcp/nomad-cluster-disk-image/Makefile @@ -16,11 +16,11 @@ build: terraform init -input=false -reconfigure -backend-config="bucket=${TERRAFORM_STATE_BUCKET}" $(tf_vars) terraform apply -auto-approve -input=false -compact-warnings packer build \ - $(if $(CONSUL_VERSION),-var "consul_version=$(CONSUL_VERSION)") \ - $(if $(NOMAD_VERSION),-var "nomad_version=$(NOMAD_VERSION)") \ + $(if $(PACKER_CONSUL_VERSION),-var "consul_version=$(PACKER_CONSUL_VERSION)") \ + $(if $(PACKER_NOMAD_VERSION),-var "nomad_version=$(PACKER_NOMAD_VERSION)") \ $(if $(PACKER_NETWORK_NAME),-var "network_name=$(PACKER_NETWORK_NAME)") \ $(if $(PACKER_SUBNET_NAME),-var "subnet_name=$(PACKER_SUBNET_NAME)") \ - $(if $(SOURCE_IMAGE),-var "source_image=$(SOURCE_IMAGE)") \ + $(if $(PACKER_SOURCE_IMAGE),-var "source_image=$(PACKER_SOURCE_IMAGE)") \ -var "gcp_project_id=$(GCP_PROJECT_ID)" \ -var "gcp_zone=$(GCP_ZONE)" \ . From 79ae8db2c7d9f0d45c9c37a9b7c506e5cddb345c Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Sat, 30 May 2026 10:34:41 +0000 Subject: [PATCH 2/4] Upgrade Consul 1.16.2 to 1.17.3, Nomad 1.6.2 to 1.8.4 Removed Nomad client `no_cgroups` flag for raw exec that is no longer supported. --- iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl | 4 ++-- iac/provider-aws/nomad-cluster/scripts/run-nomad.sh | 1 - iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl | 4 ++-- iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl index dad3887547..2bd6af265a 100644 --- a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl @@ -17,12 +17,12 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.16.2" + default = "1.17.3" } variable "nomad_version" { type = string - default = "1.6.2" + default = "1.8.4" } # Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf diff --git a/iac/provider-aws/nomad-cluster/scripts/run-nomad.sh b/iac/provider-aws/nomad-cluster/scripts/run-nomad.sh index f9fa186fa0..9cd6cf7636 100755 --- a/iac/provider-aws/nomad-cluster/scripts/run-nomad.sh +++ b/iac/provider-aws/nomad-cluster/scripts/run-nomad.sh @@ -243,7 +243,6 @@ client { plugin "raw_exec" { config { enabled = true - no_cgroups = true } } 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 1979d52718..3fadf82062 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl @@ -21,12 +21,12 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.16.2" + default = "1.17.3" } variable "nomad_version" { type = string - default = "1.6.2" + default = "1.8.4" } # Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf diff --git a/iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh b/iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh index 0375f942e1..98f2c0e8e3 100755 --- a/iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh +++ b/iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh @@ -217,7 +217,6 @@ client { plugin "raw_exec" { config { enabled = true - no_cgroups = true } } From 718e042d163411229e0c1862e2ba3181a3cde817 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Sat, 30 May 2026 10:50:43 +0000 Subject: [PATCH 3/4] Upgrade Consul 1.17.3 to 1.19.2, Nomad 1.8.4 to 1.10.5 --- iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl | 4 ++-- iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl index 2bd6af265a..7478ee0981 100644 --- a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl @@ -17,12 +17,12 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.17.3" + default = "1.19.2" } variable "nomad_version" { type = string - default = "1.8.4" + default = "1.10.5" } # Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf 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 3fadf82062..99d9cb2c41 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl @@ -21,12 +21,12 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.17.3" + default = "1.19.2" } variable "nomad_version" { type = string - default = "1.8.4" + default = "1.10.5" } # Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf From 56de665f84788032bde6ad95ecea93fde3681442 Mon Sep 17 00:00:00 2001 From: Jiri Sveceny Date: Sat, 30 May 2026 11:08:20 +0000 Subject: [PATCH 4/4] Upgrade Consul 1.19.2 to 1.21.5 --- iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl | 2 +- iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl index 7478ee0981..939780b520 100644 --- a/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl @@ -17,7 +17,7 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.19.2" + default = "1.21.5" } variable "nomad_version" { 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 99d9cb2c41..59b96c5dd0 100644 --- a/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl +++ b/iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl @@ -21,7 +21,7 @@ variable "prefix" { variable "consul_version" { type = string - default = "1.19.2" + default = "1.21.5" } variable "nomad_version" {