From 2ec238c734e2fdd0f4c883b6627c6108a9a3a4dc Mon Sep 17 00:00:00 2001 From: Kartik Chopra Date: Thu, 5 Sep 2024 15:14:57 -0400 Subject: [PATCH] set actual internal cidr as netrestrict --- .../templates/jobs/mev-commit-geth.nomad.j2 | 28 ------------------- .../nomad/playbooks/variables/profiles.yml | 8 +++--- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2 b/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2 index 2f9620034..6bbc8a4aa 100644 --- a/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2 +++ b/infrastructure/nomad/playbooks/templates/jobs/mev-commit-geth.nomad.j2 @@ -35,34 +35,6 @@ job "{{ job.name }}" { {% endfor %} } - config { - cni_config = jsonencode({ - "cniVersion": "0.4.0", - "name": "geth-network", - "plugins": [ - { - "type": "bridge", - "bridge": "br0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "172.16.30.0/24", - "routes": [ - { - "dst": "0.0.0.0/0" - } - ] - } - }, - { - "type": "portmap", - "capabilities": { "portMappings": true } - } - ] - }) - } - task "node" { driver = "exec" diff --git a/infrastructure/nomad/playbooks/variables/profiles.yml b/infrastructure/nomad/playbooks/variables/profiles.yml index 75df001b5..f5cf0cd3f 100644 --- a/infrastructure/nomad/playbooks/variables/profiles.yml +++ b/infrastructure/nomad/playbooks/variables/profiles.yml @@ -59,7 +59,7 @@ jobs: env: ip: 0.0.0.0 public_ip: "{{ ansible_facts['default_ipv4']['address'] }}" - net_restrict: 172.16.30.0/8 + net_restrict: 172.26.64.0/20 type: bootnode mev_commit_geth_signer_node1: &mev_commit_geth_signer_node1_job @@ -79,7 +79,7 @@ jobs: static: 30311 env: ip: 127.0.0.1 - net_restrict: 172.16.30.0/8 + net_restrict: 172.26.64.0/20 type: signer port: 30311 @@ -100,7 +100,7 @@ jobs: static: 30312 env: ip: 127.0.0.1 - net_restrict: 172.16.30.0/8 + net_restrict: 172.26.64.0/20 type: signer port: 30312 @@ -121,7 +121,7 @@ jobs: static: 30313 env: ip: 127.0.0.1 - net_restrict: 172.16.30.0/24 + net_restrict: 172.26.64.0/20 type: signer port: 30313