Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions iac/provider-aws/nomad-cluster-disk-image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)" \
Expand Down
4 changes: 2 additions & 2 deletions iac/provider-aws/nomad-cluster-disk-image/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ variable "prefix" {

variable "consul_version" {
type = string
default = "1.16.2"
default = "1.21.5"
}

variable "nomad_version" {
type = string
default = "1.6.2"
default = "1.10.5"
}

# Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf
Expand Down
1 change: 0 additions & 1 deletion iac/provider-aws/nomad-cluster/scripts/run-nomad.sh
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ client {
plugin "raw_exec" {
config {
enabled = true
no_cgroups = true
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Raw exec cgroup limits orchestrator

High Severity

Removing no_cgroups = true from the client raw_exec plugin config enables cgroup memory enforcement in Nomad 1.7+. The system orchestrator job uses raw_exec with no resources block, so Nomad’s default memory cap can OOM-kill the orchestrator after the LTS upgrade.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 718e042. Configure here.

}
}
Expand Down
6 changes: 3 additions & 3 deletions iac/provider-gcp/nomad-cluster-disk-image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)" \
.
Expand Down
4 changes: 2 additions & 2 deletions iac/provider-gcp/nomad-cluster-disk-image/variables.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ variable "prefix" {

variable "consul_version" {
type = string
default = "1.16.2"
default = "1.21.5"
}

variable "nomad_version" {
type = string
default = "1.6.2"
default = "1.10.5"
}

# Keep in sync with `clickhouse_version` in iac/modules/job-clickhouse/variables.tf
Expand Down
1 change: 0 additions & 1 deletion iac/provider-gcp/nomad-cluster/scripts/run-nomad.sh
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ client {
plugin "raw_exec" {
config {
enabled = true
no_cgroups = true
}
}

Expand Down
Loading