diff --git a/spartan/aztec-network/templates/anvil.yaml b/spartan/aztec-network/templates/anvil.yaml index a45c52d58b50..bdaea56bdece 100644 --- a/spartan/aztec-network/templates/anvil.yaml +++ b/spartan/aztec-network/templates/anvil.yaml @@ -69,4 +69,25 @@ spec: targetPort: {{ .Values.ethereum.service.targetPort }} {{- if and (eq .Values.ethereum.service.type "NodePort") .Values.ethereum.service.nodePort }} nodePort: {{ .Values.ethereum.service.nodePort }} - {{- end }} \ No newline at end of file + {{- end }} +--- +{{if .Values.network.public }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "aztec-network.fullname" . }}-ethereum-lb + labels: + {{- include "aztec-network.labels" . | nindent 4 }} +spec: + type: LoadBalancer + selector: + {{- include "aztec-network.selectorLabels" . | nindent 4 }} + app: ethereum + ports: + - protocol: TCP + port: {{ .Values.ethereum.service.port }} + targetPort: {{ .Values.ethereum.service.targetPort }} + {{- if and (eq .Values.ethereum.service.type "NodePort") .Values.ethereum.service.nodePort }} + nodePort: {{ .Values.ethereum.service.nodePort }} + {{- end }} +{{ end }} \ No newline at end of file diff --git a/spartan/aztec-network/templates/boot-node.yaml b/spartan/aztec-network/templates/boot-node.yaml index 6ea619b00593..ec2b2f762ae1 100644 --- a/spartan/aztec-network/templates/boot-node.yaml +++ b/spartan/aztec-network/templates/boot-node.yaml @@ -123,11 +123,19 @@ spec: resources: {{- toYaml .Values.bootNode.resources | nindent 12 }} volumes: - - name: shared-volume - emptyDir: {} - name: scripts configMap: name: {{ include "aztec-network.fullname" . }}-deploy-contracts-script + volumeClaimTemplates: + - metadata: + name: shared-volume + labels: + {{- include "aztec-network.labels" . | nindent 8 }} + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: {{ .Values.bootNode.storage }} --- apiVersion: v1 kind: Service @@ -136,7 +144,25 @@ metadata: labels: {{- include "aztec-network.labels" . | nindent 4 }} spec: - type: {{if .Values.network.public }}"LoadBalancer"{{ else }}"ClusterIP"{{ end }} + type: ClusterIP + selector: + {{- include "aztec-network.selectorLabels" . | nindent 4 }} + app: boot-node + ports: + - port: {{ .Values.bootNode.service.p2pPort }} + name: p2p + - port: {{ .Values.bootNode.service.nodePort }} + name: node +--- +{{if .Values.network.public }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "aztec-network.fullname" . }}-boot-node-lb + labels: + {{- include "aztec-network.labels" . | nindent 4 }} +spec: + type: LoadBalancer selector: {{- include "aztec-network.selectorLabels" . | nindent 4 }} app: boot-node @@ -144,4 +170,5 @@ spec: - port: {{ .Values.bootNode.service.p2pPort }} name: p2p - port: {{ .Values.bootNode.service.nodePort }} - name: node \ No newline at end of file + name: node +{{ end }} \ No newline at end of file diff --git a/spartan/aztec-network/templates/metrics.yaml b/spartan/aztec-network/templates/metrics.yaml index ff62fad5f2c9..fc3d6d3ee15c 100644 --- a/spartan/aztec-network/templates/metrics.yaml +++ b/spartan/aztec-network/templates/metrics.yaml @@ -1,4 +1,3 @@ ---- apiVersion: apps/v1 kind: Deployment metadata: @@ -17,6 +16,8 @@ spec: {{- include "aztec-network.selectorLabels" . | nindent 8 }} app: metrics spec: + securityContext: + fsGroup: {{ .Values.metrics.fileSystemUser }} # required for Grafana write access to storage volume containers: - name: otel-collector image: "{{ .Values.images.otelCollector.image }}" @@ -58,6 +59,8 @@ spec: subPath: grafana-sources.yaml - name: grafana-storage mountPath: /var/lib/grafana + securityContext: + runAsUser: {{ .Values.metrics.fileSystemUser }} # required for Grafana write access to storage volume - name: jaeger image: "{{ .Values.images.jaeger.image }}" @@ -68,8 +71,21 @@ spec: configMap: name: {{ include "aztec-network.fullname" . }}-metrics - name: grafana-storage - emptyDir: {} - + persistentVolumeClaim: + claimName: {{ include "aztec-network.fullname" . }}-grafana-pvc +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: {{ include "aztec-network.fullname" . }}-grafana-pvc + labels: + app: {{ include "aztec-network.name" . }} +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ .Values.metrics.storage }} --- apiVersion: v1 kind: Service diff --git a/spartan/aztec-network/templates/prover-node.yaml b/spartan/aztec-network/templates/prover-node.yaml index 3bdfc8effa86..dfcb8b4bbb51 100644 --- a/spartan/aztec-network/templates/prover-node.yaml +++ b/spartan/aztec-network/templates/prover-node.yaml @@ -82,12 +82,19 @@ spec: resources: {{- toYaml .Values.proverNode.resources | nindent 12 }} volumes: - - name: shared-volume - emptyDir: {} - name: scripts configMap: name: {{ include "aztec-network.fullname" . }}-configure-prover-env - + volumeClaimTemplates: + - metadata: + name: shared-volume + labels: + {{- include "aztec-network.labels" . | nindent 8 }} + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: {{ .Values.proverNode.storage }} --- apiVersion: v1 kind: ConfigMap @@ -106,10 +113,27 @@ metadata: labels: {{- include "aztec-network.labels" . | nindent 4 }} spec: - type: {{if .Values.network.public }}"LoadBalancer"{{ else }}"ClusterIP"{{ end }} + type: ClusterIP + selector: + {{- include "aztec-network.selectorLabels" . | nindent 4 }} + app: prover-node + ports: + - port: {{ .Values.proverNode.service.nodePort }} + name: node +--- +{{if .Values.network.public }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "aztec-network.fullname" . }}-prover-node-lb + labels: + {{- include "aztec-network.labels" . | nindent 4 }} +spec: + type: LoadBalancer selector: {{- include "aztec-network.selectorLabels" . | nindent 4 }} app: prover-node ports: - port: {{ .Values.proverNode.service.nodePort }} - name: node \ No newline at end of file + name: node +{{ end }} \ No newline at end of file diff --git a/spartan/aztec-network/templates/pxe.yaml b/spartan/aztec-network/templates/pxe.yaml index 52f1b8aed6ad..3725960a0b4e 100644 --- a/spartan/aztec-network/templates/pxe.yaml +++ b/spartan/aztec-network/templates/pxe.yaml @@ -66,7 +66,7 @@ metadata: labels: {{- include "aztec-network.labels" . | nindent 4 }} spec: - type: {{if .Values.network.public }}"LoadBalancer"{{ else }}"ClusterIP"{{ end }} + type: ClusterIP selector: {{- include "aztec-network.selectorLabels" . | nindent 4 }} app: pxe @@ -77,4 +77,25 @@ spec: {{- if and (eq .Values.pxe.service.type "NodePort") .Values.pxe.service.nodePort }} nodePort: {{ .Values.pxe.service.nodePort }} {{- end }} +--- +{{if .Values.network.public }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "aztec-network.fullname" . }}-pxe-lb + labels: + {{- include "aztec-network.labels" . | nindent 4 }} +spec: + type: LoadBalancer + selector: + {{- include "aztec-network.selectorLabels" . | nindent 4 }} + app: pxe + ports: + - protocol: TCP + port: {{ .Values.pxe.service.port }} + targetPort: {{ .Values.pxe.service.targetPort }} + {{- if and (eq .Values.pxe.service.type "NodePort") .Values.pxe.service.nodePort }} + nodePort: {{ .Values.pxe.service.nodePort }} + {{- end }} +{{ end }} {{- end }} \ No newline at end of file diff --git a/spartan/aztec-network/templates/validator.yaml b/spartan/aztec-network/templates/validator.yaml index 4f7785efd893..205a32a74cd2 100644 --- a/spartan/aztec-network/templates/validator.yaml +++ b/spartan/aztec-network/templates/validator.yaml @@ -91,12 +91,19 @@ spec: resources: {{- toYaml .Values.validator.resources | nindent 12 }} volumes: - - name: shared-volume - emptyDir: {} - name: scripts configMap: name: {{ include "aztec-network.fullname" . }}-configure-validator-env - + volumeClaimTemplates: + - metadata: + name: shared-volume + labels: + {{- include "aztec-network.labels" . | nindent 8 }} + spec: + accessModes: ["ReadWriteOnce"] + resources: + requests: + storage: {{ .Values.validator.storage }} --- apiVersion: v1 kind: ConfigMap @@ -115,7 +122,25 @@ metadata: labels: {{- include "aztec-network.labels" . | nindent 4 }} spec: - type: {{if .Values.network.public }}"LoadBalancer"{{ else }}"ClusterIP"{{ end }} + type: ClusterIP + selector: + {{- include "aztec-network.selectorLabels" . | nindent 4 }} + app: validator + ports: + - port: {{ .Values.validator.service.p2pPort }} + name: p2p + - port: {{ .Values.validator.service.nodePort }} + name: node +--- +{{if .Values.network.public }} +apiVersion: v1 +kind: Service +metadata: + name: {{ include "aztec-network.fullname" . }}-validator-lb + labels: + {{- include "aztec-network.labels" . | nindent 4 }} +spec: + type: LoadBalancer selector: {{- include "aztec-network.selectorLabels" . | nindent 4 }} app: validator @@ -123,4 +148,5 @@ spec: - port: {{ .Values.validator.service.p2pPort }} name: p2p - port: {{ .Values.validator.service.nodePort }} - name: node \ No newline at end of file + name: node +{{ end }} \ No newline at end of file diff --git a/spartan/aztec-network/values.yaml b/spartan/aztec-network/values.yaml index 228a3750b997..588eac5c34a6 100644 --- a/spartan/aztec-network/values.yaml +++ b/spartan/aztec-network/values.yaml @@ -46,9 +46,10 @@ bootNode: limits: memory: "4Gi" cpu: "4" + storage: "8Gi" validator: - replicas: 0 + replicas: 1 service: p2pPort: 40400 nodePort: 8080 @@ -68,6 +69,7 @@ validator: limits: memory: "28Gi" cpu: "7" + storage: "8Gi" proverNode: replicas: 1 @@ -84,6 +86,7 @@ proverNode: limits: memory: "120Gi" cpu: "15" + storage: "8Gi" pxe: logLevel: "debug" @@ -176,4 +179,6 @@ metrics: periodSeconds: 10 timeoutSeconds: 5 successThreshold: 1 - failureThreshold: 3 \ No newline at end of file + failureThreshold: 3 + storage: "8Gi" + fileSystemUser: 472 \ No newline at end of file