diff --git a/terraform/helm/aptos-node/templates/fullnode.yaml b/terraform/helm/aptos-node/templates/fullnode.yaml index edd966f30e0e9..75520ed06893d 100644 --- a/terraform/helm/aptos-node/templates/fullnode.yaml +++ b/terraform/helm/aptos-node/templates/fullnode.yaml @@ -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 }} diff --git a/terraform/helm/aptos-node/templates/validator.yaml b/terraform/helm/aptos-node/templates/validator.yaml index 05494f1e9820c..b6b55ec6f9544 100644 --- a/terraform/helm/aptos-node/templates/validator.yaml +++ b/terraform/helm/aptos-node/templates/validator.yaml @@ -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 }} @@ -184,7 +191,7 @@ spec: - ALL {{- end }} {{- with $.Values.validator }} - {{- with $.nodeSelector }} + {{- with .nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} {{- end }} diff --git a/terraform/helm/aptos-node/values.yaml b/terraform/helm/aptos-node/values.yaml index 30b5b7cf7c698..566491acccf06 100644 --- a/terraform/helm/aptos-node/values.yaml +++ b/terraform/helm/aptos-node/values.yaml @@ -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 @@ -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 @@ -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 diff --git a/terraform/helm/fullnode/templates/backup.yaml b/terraform/helm/fullnode/templates/backup.yaml index 9a80cbd4020ed..d6001a44457a3 100644 --- a/terraform/helm/fullnode/templates/backup.yaml +++ b/terraform/helm/fullnode/templates/backup.yaml @@ -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: diff --git a/terraform/helm/fullnode/values.yaml b/terraform/helm/fullnode/values.yaml index 001abbfecc79d..95a48335bee55 100644 --- a/terraform/helm/fullnode/values.yaml +++ b/terraform/helm/fullnode/values.yaml @@ -143,6 +143,8 @@ 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 @@ -150,9 +152,9 @@ backup_verify: resources: limits: cpu: 8 - memory: 32Gi + memory: 16Gi requests: - cpu: 4 + cpu: 8 memory: 16Gi nodeSelector: {} tolerations: []