Skip to content

Commit

Permalink
Sync Terraform & Helm changes
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 2cfff0468377d9135e32080baf7ddaa2efca8026
  • Loading branch information
sionescu committed Oct 23, 2024
1 parent 3ad32fe commit abc74ea
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 4 deletions.
9 changes: 8 additions & 1 deletion terraform/helm/aptos-node/templates/fullnode.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ metadata:
name: {{ include "aptos-validator.fullname" $ }}-{{$i}}-{{ .name }}
labels:
{{- include "aptos-validator.labels" $ | nindent 4 }}
{{- include "aptos-validator.multiclusterLabels" (tuple $ $i) | nindent 4 }}
{{- include "aptos-validator.multiclusterLabels" (tuple $ $i) | nindent 4 }}
annotations:
{{- with $.Values.service.fullnode.internal.annotations }}
{{- toYaml $.Values.service.fullnode.internal.annotations | nindent 4 }}
{{- end }}
{{- if $.Values.service.internalDomain }}
external-dns.alpha.kubernetes.io/hostname: vfn{{$i}}.{{ $.Values.service.internalDomain }}
{{- end }}
spec:
selector:
{{- include "aptos-validator.selectorLabels" $ | nindent 4 }}
Expand Down
9 changes: 8 additions & 1 deletion terraform/helm/aptos-node/templates/validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ metadata:
labels:
{{- include "aptos-validator.labels" $ | nindent 4 }}
{{- include "aptos-validator.multiclusterLabels" (tuple $ $i) | nindent 4 }}
annotations:
{{- with $.Values.service.validator.internal.annotations }}
{{- toYaml $.Values.service.validator.internal.annotations | nindent 4 }}
{{- end }}
{{- if $.Values.service.internalDomain }}
external-dns.alpha.kubernetes.io/hostname: val{{$i}}.{{ $.Values.service.internalDomain }}
{{- end }}
spec:
selector:
{{- include "aptos-validator.selectorLabels" $ | nindent 4 }}
Expand Down Expand Up @@ -184,7 +191,7 @@ spec:
- ALL
{{- end }}
{{- with $.Values.validator }}
{{- with $.nodeSelector }}
{{- with .nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down
4 changes: 4 additions & 0 deletions terraform/helm/aptos-node/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ fullnode:
service:
# -- If set, the base domain name to use for External DNS
domain:
# -- If set, the base domain name to use for internal LBs
internalDomain:
validator:
external:
# -- The Kubernetes ServiceType to use for validator's HAProxy
Expand All @@ -143,6 +145,7 @@ service:
# -- The Kubernetes ServiceType to use for validator
type: ClusterIP
headless: false
annotations: {}
# -- The externalTrafficPolicy for the validator service
externalTrafficPolicy: Local
# -- If set and if the ServiceType is LoadBalancer, allow traffic to validators from these CIDRs
Expand All @@ -161,6 +164,7 @@ service:
# -- The Kubernetes ServiceType to use for fullnodes
type: ClusterIP
headless: false
annotations: {}
# -- The externalTrafficPolicy for the fullnode service
externalTrafficPolicy: Local
# -- If set and if the ServiceType is LoadBalancer, allow traffic to fullnodes from these CIDRs
Expand Down
4 changes: 4 additions & 0 deletions terraform/helm/fullnode/templates/backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ spec:
- "{{ int .config.state_snapshot_interval_epochs }}"
- "--transaction-batch-size"
- "{{ int .config.transaction_batch_size }}"
{{- if .config.concurrent_data_requests }}
- "--concurrent-data-requests"
- "{{ int .config.concurrent_data_requests }}"
{{- end }}
- "--command-adapter-config"
- "/opt/aptos/etc/{{ .config.location }}.yaml"
env:
Expand Down
6 changes: 4 additions & 2 deletions terraform/helm/fullnode/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,18 @@ backup:
state_snapshot_interval_epochs: 2
# -- Transaction batch size
transaction_batch_size: 1000000
# -- Number of concurrent requests to the PFN backup port
concurrent_data_requests:

backup_verify:
# -- The schedule for backup verification
schedule: "@daily"
resources:
limits:
cpu: 8
memory: 32Gi
memory: 16Gi
requests:
cpu: 4
cpu: 8
memory: 16Gi
nodeSelector: {}
tolerations: []
Expand Down

0 comments on commit abc74ea

Please sign in to comment.