Skip to content
Merged
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
7 changes: 2 additions & 5 deletions spartan/aztec-network/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}"
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/boot-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/full-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/prover-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/prover-broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/prover-node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/transaction-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 1 addition & 0 deletions spartan/aztec-network/templates/validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down