diff --git a/infra/eu-west-2/core/ansible/playbook_bastion.yaml b/infra/eu-west-2/core/ansible/playbook_bastion.yaml index ae4204c..894b91f 100644 --- a/infra/eu-west-2/core/ansible/playbook_bastion.yaml +++ b/infra/eu-west-2/core/ansible/playbook_bastion.yaml @@ -8,8 +8,9 @@ - role: gantsign.golang vars: golang_gopath: "/home/{{ ansible_user_id }}/go" - golang_version: "1.22.4" - golang_redis_sha256sum: "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" + golang_version: "1.26.0" + golang_redis_sha256sum: "aac1b08a0fb0c4e0a7c1555beb7b59180b05dfc5a3d62e40e9de90cd42f88235" + golang_mirror: https://go.dev/dl - role: hashicorp.nomad_bench.influxdb_telegraf vars: diff --git a/infra/eu-west-2/core/main.tf b/infra/eu-west-2/core/main.tf index bc54a06..c6fe45f 100644 --- a/infra/eu-west-2/core/main.tf +++ b/infra/eu-west-2/core/main.tf @@ -26,7 +26,7 @@ module "ssh" { data "aws_ami" "ubuntu" { filter { name = "name" - values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20240126"] + values = ["ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20251212"] } most_recent = true diff --git a/shared/ansible/hashicorp/nomad_bench/requirements.txt b/shared/ansible/hashicorp/nomad_bench/requirements.txt index cfb6dc3..dd527d1 100644 --- a/shared/ansible/hashicorp/nomad_bench/requirements.txt +++ b/shared/ansible/hashicorp/nomad_bench/requirements.txt @@ -1,11 +1,11 @@ -ansible==9.2.0 -ansible-core==2.16.3 -cffi==1.16.0 -cryptography==42.0.2 -Jinja2==3.1.3 +ansible==13.3.0 +ansible-core==2.20.2 +cffi==2.0.0 +cryptography==46.0.5 +Jinja2==3.1.6 jmespath==1.0.1 -MarkupSafe==2.1.4 -packaging==23.2 -pycparser==2.21 -PyYAML==6.0.1 -resolvelib==1.0.1 +MarkupSafe==3.0.3 +packaging==26.0 +pycparser==3.0 +PyYAML==6.0.3 +resolvelib==1.2.1 diff --git a/shared/ansible/hashicorp/nomad_bench/requirements.yaml b/shared/ansible/hashicorp/nomad_bench/requirements.yaml index a2820ec..03a6986 100644 --- a/shared/ansible/hashicorp/nomad_bench/requirements.yaml +++ b/shared/ansible/hashicorp/nomad_bench/requirements.yaml @@ -5,8 +5,11 @@ roles: - src: "geerlingguy.docker" version: "7.1.0" - src: "gantsign.golang" - version: "3.2.4" + version: "3.5.0" collections: - name: "cloud.terraform" version: "2.0.0" + - name: "hashicorp.nomad_bench" + source: "shared/ansible/hashicorp/nomad_bench" + type: "dir" diff --git a/shared/ansible/hashicorp/nomad_bench/roles/nomad/defaults/main.yaml b/shared/ansible/hashicorp/nomad_bench/roles/nomad/defaults/main.yaml index 2978f13..08c2a74 100644 --- a/shared/ansible/hashicorp/nomad_bench/roles/nomad/defaults/main.yaml +++ b/shared/ansible/hashicorp/nomad_bench/roles/nomad/defaults/main.yaml @@ -1,7 +1,7 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 -nomad_version: "1.8.1" +nomad_version: "1.11.2" nomad_release_arch_map: amd64: "amd64" @@ -37,10 +37,10 @@ nomad_server_bootstrap_expect: 3 nomad_client_enabled: false -nomad_host_volumes: [ ] +nomad_host_volumes: [] nomad_plugins: {} -nomad_server_join_retry_join: [ ] +nomad_server_join_retry_join: [] nomad_server_join_retry_max: 0 nomad_server_join_retry_interval: "30s" diff --git a/shared/ansible/hashicorp/nomad_bench/roles/nomad_lb/defaults/main.yaml b/shared/ansible/hashicorp/nomad_bench/roles/nomad_lb/defaults/main.yaml index ca96136..5333f36 100644 --- a/shared/ansible/hashicorp/nomad_bench/roles/nomad_lb/defaults/main.yaml +++ b/shared/ansible/hashicorp/nomad_bench/roles/nomad_lb/defaults/main.yaml @@ -1,9 +1,9 @@ # Copyright (c) HashiCorp, Inc. # SPDX-License-Identifier: MPL-2.0 -nomad_lb_nginx_apt_version: "1.18.0-6ubuntu14.4" +nomad_lb_nginx_apt_version: "1.18.0-6ubuntu14.8" nomad_lb_ca_cert: "" nomad_lb_tls_cert: "" nomad_lb_tls_cert_key: "" -nomad_lb_server_ips: [ ] -nomad_lb_client_ips: [ ] +nomad_lb_server_ips: [] +nomad_lb_client_ips: [] diff --git a/shared/ansible/requirements.txt b/shared/ansible/requirements.txt index cfb6dc3..dd527d1 100644 --- a/shared/ansible/requirements.txt +++ b/shared/ansible/requirements.txt @@ -1,11 +1,11 @@ -ansible==9.2.0 -ansible-core==2.16.3 -cffi==1.16.0 -cryptography==42.0.2 -Jinja2==3.1.3 +ansible==13.3.0 +ansible-core==2.20.2 +cffi==2.0.0 +cryptography==46.0.5 +Jinja2==3.1.6 jmespath==1.0.1 -MarkupSafe==2.1.4 -packaging==23.2 -pycparser==2.21 -PyYAML==6.0.1 -resolvelib==1.0.1 +MarkupSafe==3.0.3 +packaging==26.0 +pycparser==3.0 +PyYAML==6.0.3 +resolvelib==1.2.1 diff --git a/shared/ansible/requirements.yaml b/shared/ansible/requirements.yaml index df91c9e..03a6986 100644 --- a/shared/ansible/requirements.yaml +++ b/shared/ansible/requirements.yaml @@ -5,7 +5,7 @@ roles: - src: "geerlingguy.docker" version: "7.1.0" - src: "gantsign.golang" - version: "3.2.4" + version: "3.5.0" collections: - name: "cloud.terraform"