Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: always respect aztec image pull policy #10617

Merged
merged 2 commits into from
Dec 11, 2024
Merged

fix: always respect aztec image pull policy #10617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33e1ad3
fix: always respect aztec image pull policy
just-mitch Dec 11, 2024
68d2d66
fix: a few more
just-mitch Dec 11, 2024
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
8 changes: 8 additions & 0 deletions spartan/aztec-network/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,14 @@ app.kubernetes.io/name: {{ include "aztec-network.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Aztec Image
*/}}
{{- define "aztec-network.image" -}}
image: {{ .Values.images.aztec.image }}
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- end -}}



{{- define "aztec-network.pxeUrl" -}}
Expand Down
6 changes: 3 additions & 3 deletions spartan/aztec-network/templates/boot-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
{{- include "aztec-network.p2pSetupContainer" . | nindent 8 }}
{{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }}
- name: wait-for-ethereum
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand All @@ -62,7 +62,7 @@ spec:
mountPath: /shared/config
{{- if .Values.bootNode.deployContracts }}
- name: deploy-l1-contracts
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
[
"/bin/bash",
Expand Down Expand Up @@ -97,7 +97,7 @@ spec:
{{- end }}
containers:
- name: boot-node
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/deploy-l1-verifier.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
name: {{ include "aztec-network.fullname" . }}-scripts
containers:
- name: deploy-l1-verifier
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand Down
5 changes: 2 additions & 3 deletions spartan/aztec-network/templates/prover-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ spec:
initContainers:
{{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }}
- name: wait-for-prover-node
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand All @@ -69,8 +69,7 @@ spec:
mountPath: /shared/config
containers:
- name: prover-agent
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
volumeMounts:
- name: config
mountPath: /shared/config
Expand Down
5 changes: 2 additions & 3 deletions spartan/aztec-network/templates/prover-broker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
initContainers:
{{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }}
- name: wait-for-prover-node
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand All @@ -51,8 +51,7 @@ spec:
mountPath: /shared/config
containers:
- name: prover-broker
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
volumeMounts:
- name: config
mountPath: /shared/config
Expand Down
8 changes: 3 additions & 5 deletions spartan/aztec-network/templates/prover-node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ spec:
{{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }}
{{- include "aztec-network.p2pSetupContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -71,8 +71,7 @@ spec:
value: "{{ .Values.proverNode.proverBroker.enabled }}"

- name: configure-prover-env
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- "/bin/bash"
- "-c"
Expand All @@ -90,8 +89,7 @@ spec:

containers:
- name: prover-node
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- "/bin/bash"
- "-c"
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/pxe.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ spec:
{{- end }}
containers:
- name: pxe
image: "{{ .Values.images.aztec.image }}"
{{- include "aztec-network.image" . | nindent 10 }}
volumeMounts:
- name: config
mountPath: /shared/config
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/setup-l2-contracts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
emptyDir: {}
containers:
- name: setup-l2-contracts
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
volumeMounts:
- name: config
mountPath: /shared/config
Expand Down
2 changes: 1 addition & 1 deletion spartan/aztec-network/templates/transaction-bot.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
mountPath: /shared/config
containers:
- name: transaction-bot
image: "{{ .Values.images.aztec.image }}"
{{- include "aztec-network.image" . | nindent 10 }}
volumeMounts:
- name: config
mountPath: /shared/config
Expand Down
8 changes: 3 additions & 5 deletions spartan/aztec-network/templates/validator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
{{- include "aztec-network.p2pSetupContainer" . | nindent 8 }}
{{- include "aztec-network.serviceAddressSetupContainer" . | nindent 8 }}
- name: wait-for-services
image: {{ .Values.images.aztec.image }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- /bin/bash
- -c
Expand Down Expand Up @@ -79,8 +79,7 @@ spec:
mountPath: /shared/config

- name: configure-validator-env
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- "/bin/bash"
- "-c"
Expand Down Expand Up @@ -108,8 +107,7 @@ spec:
fieldPath: metadata.name
containers:
- name: validator
image: "{{ .Values.images.aztec.image }}"
imagePullPolicy: {{ .Values.images.aztec.pullPolicy }}
{{- include "aztec-network.image" . | nindent 10 }}
command:
- "/bin/bash"
- "-c"
Expand Down
Loading