Merge pull request #158 from ethpandaops/bbusa/yeet-srv

feat: remove srv
ethpandaops · Oct 23, 2023 · 9a793b2 · 9a793b2
2 parents b70c2e7 + c6f33b0
commit 9a793b2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/roles/generate_kubernetes_config/templates/checkpointz.yaml.j2 b/roles/generate_kubernetes_config/templates/checkpointz.yaml.j2
@@ -50,6 +50,6 @@ checkpointz:
         dataProvider: true
 {% for host in (groups['ethereum_node'] + groups['bootnode']) | sort %}
       - name: {{ hostvars[host]['inventory_hostname'] }}
-        address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.srv.{{ network_subdomain }}
+        address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.{{ network_subdomain }}
         dataProvider: true
 {% endfor %}
diff --git a/roles/generate_kubernetes_config/templates/config.yaml.j2 b/roles/generate_kubernetes_config/templates/config.yaml.j2
@@ -91,8 +91,8 @@ config:
 
     # Ansible generated ethereum nodes inventory
     - path: /api/v1/nodes/inventory
-      upstream: bootnode-1.srv.{{ network_subdomain }}
+      upstream: bootnode-1.{{ network_subdomain }}
       target: /meta/api/v1/inventory.json
     - path: /api/v1/nodes/validator-ranges
-      upstream: bootnode-1.srv.{{ network_subdomain }}
+      upstream: bootnode-1.{{ network_subdomain }}
       target: /meta/api/v1/validator-ranges.json
diff --git a/roles/generate_kubernetes_config/templates/dora.yaml.j2 b/roles/generate_kubernetes_config/templates/dora.yaml.j2
@@ -37,7 +37,7 @@ dora:
     archive: true
     priority: 1
 {% for host in (groups['ethereum_node'] + groups['bootnode']) | sort %}
-  - url: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.srv.{{ network_subdomain }}
+  - url: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.{{ network_subdomain }}
     name: {{ hostvars[host]['inventory_hostname'] }}
     priority: -1
 {% if 'lighthouse' in hostvars[host]['inventory_hostname'] %}

diff --git a/roles/generate_kubernetes_config/templates/forkmon.yaml.j2 b/roles/generate_kubernetes_config/templates/forkmon.yaml.j2
@@ -19,7 +19,7 @@ forkmon:
   - addr: {{ default_el_endpoint }}
     name: rpc-{{ gen_kubernetes_config_ethereum_node_name }}
 {% for host in (groups['ethereum_node'] + groups['bootnode']) | sort %}
-  - addr: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@rpc.{{ hostvars[host]['inventory_hostname'] }}.srv.{{ network_subdomain }}
+  - addr: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@rpc.{{ hostvars[host]['inventory_hostname'] }}.{{ network_subdomain }}
     name: {{ hostvars[host]['inventory_hostname'] }}
 {% endfor %}
 {% raw %}

diff --git a/roles/generate_kubernetes_config/templates/forky.yaml.j2 b/roles/generate_kubernetes_config/templates/forky.yaml.j2
@@ -44,6 +44,6 @@ forky:
         - name: {{ hostvars[host]['inventory_hostname'] }}
           type: "beacon_node"
           config:
-            address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.srv.{{ network_subdomain }}
+            address: https://<path:/secrets/services/services.enc.yaml#ethereum | jsonPath {.testnets.dencun-devnets.node_ingress.combined}>@bn.{{ hostvars[host]['inventory_hostname'] }}.{{ network_subdomain }}
             polling_interval: "12s"
 {% endfor %}