[helm] remove ratelimit default and make it configurable

Closes: aptos-labs#259
Amper555 · Mar 21, 2022 · c109282 · c109282
1 parent c2d1970
commit c109282
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/terraform/helm/fullnode/files/fullnode.yaml b/terraform/helm/fullnode/files/fullnode.yaml
@@ -17,15 +17,9 @@ full_node_networks:
   seeds:
     {{- (get .Values.aptos_chains .Values.chain.name).seeds | default dict | toYaml | nindent 6 }}
   inbound_rate_limit_config:
-    ip_byte_bucket_rate: 1048576
-    ip_byte_bucket_size: 1048576
-    initial_bucket_fill_percentage: 25
-    enabled: true
+    {{- .Values.fullnode_inbound_rate_limit | toYaml | nindent 6 }}
   outbound_rate_limit_config:
-    ip_byte_bucket_rate: 1048576
-    ip_byte_bucket_size: 1048576
-    initial_bucket_fill_percentage: 25
-    enabled: true
+    {{- .Values.fullnode_outbound_rate_limit | toYaml | nindent 6 }}
 
 storage:
   backup_service_address: "0.0.0.0:6186"

diff --git a/terraform/helm/fullnode/values.yaml b/terraform/helm/fullnode/values.yaml
@@ -12,6 +12,17 @@ fullnode_identity:
   # Set this to start fullnode from an existing key.
   # If not set, it will generate a random one on startup.
 
+fullnode_inbound_rate_limit:
+  enabled: true
+  ip_byte_bucket_rate: 1048576
+  ip_byte_bucket_size: 1048576
+  initial_bucket_fill_percentage: 25
+fullnode_outbound_rate_limit:
+  enabled: true
+  ip_byte_bucket_rate: 1048576
+  ip_byte_bucket_size: 1048576
+  initial_bucket_fill_percentage: 25
+
 rust_log: info
 
 image:

diff --git a/terraform/helm/validator/files/configs/fullnode.yaml b/terraform/helm/validator/files/configs/fullnode.yaml
@@ -40,15 +40,9 @@ full_node_networks:
   {{- end }}
   max_inbound_connections: {{ .Values.fullnode.config.max_inbound_connections }}
   inbound_rate_limit_config:
-    ip_byte_bucket_rate: 1048576
-    ip_byte_bucket_size: 1048576
-    initial_bucket_fill_percentage: 25
-    enabled: true
+    {{- .Values.fullnode.config.inbound_rate_limit | toYaml | nindent 6 }}
   outbound_rate_limit_config:
-    ip_byte_bucket_rate: 1048576
-    ip_byte_bucket_size: 1048576
-    initial_bucket_fill_percentage: 25
-    enabled: true
+    {{- .Values.fullnode.config.outbound_rate_limit | toYaml | nindent 6 }}
   identity:
     type: "from_storage"
     key_name: "fullnode_network"

diff --git a/terraform/helm/validator/values.yaml b/terraform/helm/validator/values.yaml
@@ -167,6 +167,16 @@ fullnode:
   affinity: {}
   config:
     max_inbound_connections: 1000
+    inbound_rate_limit:
+      enabled: true
+      ip_byte_bucket_rate: 1048576
+      ip_byte_bucket_size: 1048576
+      initial_bucket_fill_percentage: 25
+    outbound_rate_limit:
+      enabled: true
+      ip_byte_bucket_rate: 1048576
+      ip_byte_bucket_size: 1048576
+      initial_bucket_fill_percentage: 25
 
 keymanager:
   image: