diff --git a/spartan/aztec-network/templates/_helpers.tpl b/spartan/aztec-network/templates/_helpers.tpl index 3a0fb55da3c4..1b9c0e2b8407 100644 --- a/spartan/aztec-network/templates/_helpers.tpl +++ b/spartan/aztec-network/templates/_helpers.tpl @@ -287,12 +287,12 @@ Combined wait-for-services and configure-env container for full nodes {{- end -}} {{/* -Combined P2P, Service Address, and OpenTelemetry Setup Container +Combined P2P, and Service Address Setup Container */}} {{- define "aztec-network.combinedAllSetupContainer" -}} {{- $serviceName := base $.Template.Name | trimSuffix ".yaml" -}} - name: setup-all - {{- include "aztec-network.image" . | nindent 2 }} + image: bitnami/kubectl command: - /bin/bash - -c @@ -302,9 +302,6 @@ Combined P2P, Service Address, and OpenTelemetry Setup Container # Setup service addresses /scripts/setup-service-addresses.sh - - # Setup OpenTelemetry resource - /scripts/setup-otel-resource.sh env: - name: NETWORK_PUBLIC value: "{{ .Values.network.public }}" diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml index b0897148e2c4..39ff87d3e44f 100644 --- a/spartan/aztec-network/templates/boot-node.yaml +++ b/spartan/aztec-network/templates/boot-node.yaml @@ -42,6 +42,7 @@ spec: terminationGracePeriodSeconds: 5 # default is 30 - speed up initcontainer termination initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} # Generate the validator addresses; used in the deploy-l1-contracts step - name: generate-validator-addresses diff --git a/spartan/aztec-network/templates/full-node.yaml b/spartan/aztec-network/templates/full-node.yaml index d983766777b8..9c5de221b857 100644 --- a/spartan/aztec-network/templates/full-node.yaml +++ b/spartan/aztec-network/templates/full-node.yaml @@ -41,6 +41,7 @@ spec: {{- end }} initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} {{- include "aztec-network.combinedWaitAndConfigureContainer" . | nindent 8 }} containers: diff --git a/spartan/aztec-network/templates/prover-agent.yaml b/spartan/aztec-network/templates/prover-agent.yaml index 51b76161119c..d501d0b8c732 100644 --- a/spartan/aztec-network/templates/prover-agent.yaml +++ b/spartan/aztec-network/templates/prover-agent.yaml @@ -46,6 +46,7 @@ spec: defaultMode: 0755 initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} - name: wait-for-prover-node {{- include "aztec-network.image" . | nindent 10 }} command: diff --git a/spartan/aztec-network/templates/prover-broker.yaml b/spartan/aztec-network/templates/prover-broker.yaml index 5eeff959ddd5..90c221bffe16 100644 --- a/spartan/aztec-network/templates/prover-broker.yaml +++ b/spartan/aztec-network/templates/prover-broker.yaml @@ -49,6 +49,7 @@ spec: defaultMode: 0755 initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} - name: wait-for-dependencies {{- include "aztec-network.image" . | nindent 10 }} diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml index efeeb50ccadc..674661fa94c1 100644 --- a/spartan/aztec-network/templates/prover-node.yaml +++ b/spartan/aztec-network/templates/prover-node.yaml @@ -41,6 +41,7 @@ spec: terminationGracePeriodSeconds: 5 # default is 30 - speed up initcontainer termination initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} - name: get-private-key image: {{ .Values.images.foundry.image }} diff --git a/spartan/aztec-network/templates/transaction-bot.yaml b/spartan/aztec-network/templates/transaction-bot.yaml index 0f0217ca7ec1..09330adfca0d 100644 --- a/spartan/aztec-network/templates/transaction-bot.yaml +++ b/spartan/aztec-network/templates/transaction-bot.yaml @@ -50,6 +50,7 @@ spec: terminationGracePeriodSeconds: 5 # default is 30 - speed up initcontainer termination initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} - name: get-private-key image: {{ .Values.images.foundry.image }} diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml index e6f7edc209f7..8e06f66ded9a 100644 --- a/spartan/aztec-network/templates/validator.yaml +++ b/spartan/aztec-network/templates/validator.yaml @@ -43,6 +43,7 @@ spec: terminationGracePeriodSeconds: 5 # default is 30 - speed up initcontainer termination initContainers: {{- include "aztec-network.combinedAllSetupContainer" . | nindent 8 }} + {{- include "aztec-network.otelResourceSetupContainer" . | nindent 8 }} # Get the private key from the mnemonic - based on the pod replica index - name: get-private-key