chore: rename enable parameter to enabled (#478)

Signed-off-by: Quan Nguyen <[email protected]>

charts/fullstack-cluster-setup/Chart.yaml

@@ -28,15 +28,15 @@ dependencies:
     alias: minio-operator
     version: 5.0.7
     repository: https://operator.min.io/
-    condition: cloud.minio.enable
+    condition: cloud.minio.enabled
 
   - name: kube-prometheus-stack
     alias: prometheus-stack
     version: 52.0.1
     repository: https://prometheus-community.github.io/helm-charts
-    condition: cloud.prometheusStack.enable
+    condition: cloud.prometheusStack.enabled
 
   - name: grafana-agent
     version: 0.27.1
     repository: https://grafana.github.io/helm-charts
-    condition: cloud.grafanaAgent.enable
+    condition: cloud.grafanaAgent.enabled

charts/fullstack-cluster-setup/values.yaml

@@ -10,8 +10,8 @@ global:
 # cloud configuration
 cloud:
   minio:
-    enable: false
+    enabled: false
   prometheusStack:
-    enable: false
+    enabled: false
   grafanaAgent:
-    enable: false
+    enabled: false

charts/fullstack-deployment/Chart.yaml

@@ -31,17 +31,17 @@ kubeVersion: ">=1.25.0-0"
 dependencies:
   - name: hedera-explorer
     version: 0.2.0
-    condition: hedera-explorer.enable
+    condition: hedera-explorer.enabled
 
   - name: hedera-mirror
     alias: hedera-mirror-node
     version: 0.86.0
     repository: https://hashgraph.github.io/hedera-mirror-node/charts
-    condition: hedera-mirror-node.enable
+    condition: hedera-mirror-node.enabled
 
   - name: tenant
     alias: minio-server
     version: 5.0.7
     repository: https://operator.min.io/
-    condition: cloud.minio.enable
+    condition: cloud.minio.enabled
 

charts/fullstack-deployment/config-files/otel-collector-config.yaml

@@ -22,7 +22,7 @@ exporters:
     const_labels:
       source: p-{{ default "otel-collector" .otelDefaults.nameOverride }} # PromQL: {source="p-otel-collector"}
 
-  {{- if eq .otelDefaults.exporters.prometheusRemoteWrite.enable "true" }}
+  {{- if eq .otelDefaults.exporters.prometheusRemoteWrite.enabled "true" }}
   prometheusremotewrite:
     endpoint: "{{ .otelDefaults.exporters.prometheusRemoteWrite.endpoint }}"
     tls:
@@ -55,6 +55,6 @@ service:
       processors: [batch]
       exporters:
         - prometheus
-        {{- if eq .otelDefaults.exporters.prometheusRemoteWrite.enable "true" }}
+        {{- if eq .otelDefaults.exporters.prometheusRemoteWrite.enabled "true" }}
         - prometheusremotewrite
         {{- end }}

charts/fullstack-deployment/templates/gateway-api/envoy-grpc-web-routes.yaml

@@ -1,7 +1,7 @@
 {{- range $index, $node := ($.Values.hedera.nodes) }}
 {{- $envoyProxy := $node.envoyProxy | default dict -}}
 {{- $defaults := $.Values.defaults.envoyProxy }}
-{{- if default $defaults.enable $envoyProxy.enable | eq "true" }}
+{{- if default $defaults.enabled $envoyProxy.enabled | eq "true" }}
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: HTTPRoute

charts/fullstack-deployment/templates/gateway-api/gateway.yaml

@@ -1,4 +1,4 @@
-{{- if $.Values.gatewayApi.gateway.enable | eq "true" }}
+{{- if $.Values.gatewayApi.gateway.enabled | eq "true" }}
 apiVersion: gateway.networking.k8s.io/v1beta1
 kind: Gateway
 metadata:
@@ -14,7 +14,7 @@ spec:
   {{- $grpcs_start_port    := $.Values.gatewayApi.gateway.listeners.grpcs.port }} # i.e. node0:53000 ... node999: 53999, points to 50212 port in haproxy or network-node
   {{- $grpc_web_start_port := $.Values.gatewayApi.gateway.listeners.grpcWeb.port }} # i.e. node0:18000 ... node999: 18999, points to 8080 port in envoy proxy
   {{- range $index, $node := $.Values.hedera.nodes }} # we assume to have at most 999 nodes in a single cluster
-    {{- if $.Values.gatewayApi.gateway.listeners.gossip.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.gossip.enabled | eq "true" }}
     {{- $gossip_port := add $index $gossip_start_port }}
     - name: gossip-{{ $node.name }} # for exposing gossip port 50111 from network-node
       protocol: TCP
@@ -23,7 +23,7 @@ spec:
         kinds:
           - kind: TCPRoute
     {{- end }}
-    {{- if $.Values.gatewayApi.gateway.listeners.grpc.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.grpc.enabled | eq "true" }}
     {{- $grpc_port := add $index $grpc_start_port }}
     - name: grpc-{{ $node.name }} # for exposing grpc port 50211 from haproxy or network-node
       protocol: TCP
@@ -32,7 +32,7 @@ spec:
         kinds:
           - kind: TCPRoute
     {{- end }}
-    {{- if $.Values.gatewayApi.gateway.listeners.grpcs.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.grpcs.enabled | eq "true" }}
     {{- $grpcs_port := add $index $grpcs_start_port }}
     - name: grpcs-{{ $node.name }} # for exposing grpc port 50212 from haproxy or network-node
       protocol: TCP
@@ -41,25 +41,25 @@ spec:
         kinds:
           - kind: TCPRoute
     {{- end }}
-    {{- if $.Values.gatewayApi.gateway.listeners.grpcWeb.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.grpcWeb.enabled | eq "true" }}
     {{- $grpc_web_port := add $index $grpc_web_start_port }}
     - name: grpc-web-{{ $node.name }} # for exposing grpc-web port 8080 from envoy-proxy
       protocol: HTTP
       port: {{ $grpc_web_port }}
     {{- end }}
   {{- end }}
-    {{- if $.Values.gatewayApi.gateway.listeners.hederaExplorer.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.hederaExplorer.enabled | eq "true" }}
     - name: hedera-explorer # for exposing fst-hedera-explorer port 80
       protocol: HTTP
       port: {{ $.Values.gatewayApi.gateway.listeners.hederaExplorer.port }}
     {{- end }}
    # Debug ports
-    {{- if $.Values.gatewayApi.gateway.listeners.httpDebug.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.httpDebug.enabled | eq "true" }}
     - name: http-debug # this helps debugging gateway if needed
       protocol: HTTP
       port: {{ $.Values.gatewayApi.gateway.listeners.httpDebug.port }}
     {{- end }}
-    {{- if $.Values.gatewayApi.gateway.listeners.tcpDebug.enable | eq "true" }}
+    {{- if $.Values.gatewayApi.gateway.listeners.tcpDebug.enabled | eq "true" }}
     - name: tcp-debug # this helps debugging gateway if needed
       protocol: TCP
       port: {{ $.Values.gatewayApi.gateway.listeners.tcpDebug.port }}

charts/fullstack-deployment/templates/gateway-api/haproxy-grpc-routes.yaml

@@ -1,7 +1,7 @@
 {{- range $index, $node := ($.Values.hedera.nodes) }}
 {{- $haproxy := $node.haproxy | default dict -}}
 {{- $defaults := $.Values.defaults.haproxy }}
-{{- if default $defaults.enable $haproxy.enable | eq "true" }}
+{{- if default $defaults.enabled $haproxy.enabled | eq "true" }}
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TCPRoute

charts/fullstack-deployment/templates/gateway-api/network-node-grpc-routes.yaml

@@ -1,7 +1,7 @@
 {{- range $index, $node := ($.Values.hedera.nodes) }}
 {{- $haproxy := $node.haproxy | default dict -}}
 {{- $defaults := $.Values.defaults.haproxy }}
-{{- if default $defaults.enable $haproxy.enable | eq "false" }}
+{{- if default $defaults.enabled $haproxy.enabled | eq "false" }}
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
 kind: TCPRoute

charts/fullstack-deployment/templates/network-node-statefulset.yaml

@@ -56,7 +56,7 @@ spec:
       volumes:
         - name: hgcapp-storage # change me
           emptyDir: {}
-        {{- if default $defaults.sidecars.otelCollector.enable  $otelCollector.enable | eq "true" }}
+        {{- if default $defaults.sidecars.otelCollector.enabled $otelCollector.enabled | eq "true" }}
         - name: otel-collector-volume
           configMap:
             name: otel-collector-cm

charts/fullstack-deployment/templates/proxy/envoy-deployment.yaml

@@ -1,7 +1,7 @@
 {{ range $index, $node := ($.Values.hedera.nodes) }}
 {{- $envoyProxy := $node.envoyProxy | default dict -}}
 {{- $defaults := $.Values.defaults.envoyProxy }}
-{{- if default $defaults.enable $envoyProxy.enable | eq "true" }}
+{{- if default $defaults.enabled $envoyProxy.enabled | eq "true" }}
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/fullstack-deployment/templates/proxy/haproxy-deployment.yaml

@@ -1,7 +1,7 @@
 {{ range $index, $node := ($.Values.hedera.nodes) }}
 {{- $haproxy := $node.haproxy | default dict -}}
 {{- $defaults := $.Values.defaults.haproxy }}
-{{- if default $defaults.enable $haproxy.enable | eq "true" }}
+{{- if default $defaults.enabled $haproxy.enabled | eq "true" }}
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/fullstack-deployment/templates/services/envoy-svc.yaml

@@ -1,7 +1,7 @@
 {{ range $index, $node := ($.Values.hedera.nodes) }}
 {{- $envoyProxy := $node.envoyProxy | default dict -}}
 {{- $defaults := $.Values.defaults.envoyProxy }}
-{{- if default $defaults.enable $envoyProxy.enable | eq "true" }}
+{{- if default $defaults.enabled $envoyProxy.enabled | eq "true" }}
 ---
 apiVersion: v1
 kind: Service

charts/fullstack-deployment/templates/services/haproxy-svc.yaml

@@ -1,7 +1,7 @@
 {{- range $index, $node := ($.Values.hedera.nodes) }}
 {{- $haproxy := $node.haproxy | default dict -}}
 {{- $defaults := $.Values.defaults.haproxy }}
-{{- if default $defaults.enable $haproxy.enable | eq "true" }}
+{{- if default $defaults.enabled $haproxy.enabled | eq "true" }}
 ---
 apiVersion: v1
 kind: Service

charts/fullstack-deployment/templates/sidecars/_account-balance-uploader.tpl

@@ -27,7 +27,7 @@
     - name: DEBUG
       value: {{ default $defaults.config.debug ($balanceUploader.config).debug | quote }}
     - name: REAPER_ENABLE
-      value: {{ default $defaults.config.reaper.enable (($balanceUploader.config).reaper).enable | quote  }}
+      value: {{ default $defaults.config.reaper.enabled (($balanceUploader.config).reaper).enabled | quote  }}
     - name: REAPER_MIN_KEEP
       value: {{ default $defaults.config.reaper.minKeep (($balanceUploader.config).reaper).minKeep | quote }}
     - name: REAPER_INTERVAL

charts/fullstack-deployment/templates/sidecars/_event-stream-uploader.tpl

@@ -28,7 +28,7 @@
     - name: DEBUG
       value: {{ default $defaults.config.debug ($eventStream.config).debug | quote}}
     - name: REAPER_ENABLE
-      value: {{ default $defaults.config.reaper.enable (($eventStream.config).reaper).enable | quote }}
+      value: {{ default $defaults.config.reaper.enabled (($eventStream.config).reaper).enabled | quote }}
     - name: REAPER_MIN_KEEP
       value: {{ default $defaults.config.reaper.minKeep (($eventStream.config).reaper).minKeep | quote }}
     - name: REAPER_INTERVAL

charts/fullstack-deployment/templates/sidecars/_record-stream-uploader.tpl

@@ -29,7 +29,7 @@
     - name: DEBUG
       value: {{ default $defaults.config.debug ($recordStream.config).debug | quote }}
     - name: REAPER_ENABLE
-      value: {{ default $defaults.config.reaper.enable (($recordStream.config).reaper).enable | quote }}
+      value: {{ default $defaults.config.reaper.enabled (($recordStream.config).reaper).enabled | quote }}
     - name: REAPER_MIN_KEEP
       value: {{ default $defaults.config.reaper.minKeep (($recordStream.config).reaper).minKeep | quote }}
     - name: REAPER_INTERVAL

charts/fullstack-deployment/templates/sidecars/_sidecars.tpl

@@ -9,27 +9,27 @@
 {{- $chart := .chart | required "context must include 'chart'!" -}}
 {{- $nodeId := .node.accountId -}}
 {{- $minioserver := .minioserver -}}
-  {{- if default $defaults.sidecars.recordStreamUploader.enable  $recordStream.enable | eq "true" }}
+  {{- if default $defaults.sidecars.recordStreamUploader.enabled $recordStream.enabled | eq "true" }}
   # Sidecar: Record Stream Uploader
   {{- $data := dict "recordStream" $recordStream "cloud" $cloud "chart" $chart "defaults" $defaults.sidecars.recordStreamUploader "nodeId" $nodeId "minioserver" $minioserver -}}
   {{ include "fullstack.sidecars.recordStreamUploader" $data | nindent 0 }}
   {{- end }}
-  {{- if default $defaults.sidecars.eventStreamUploader.enable  $eventStream.enable | eq "true" }}
+  {{- if default $defaults.sidecars.eventStreamUploader.enabled $eventStream.enabled | eq "true" }}
   # Sidecar: Event Stream Uploader
   {{- $data := dict "eventStream" $eventStream "cloud" $cloud "chart" $chart "defaults" $defaults.sidecars.eventStreamUploader  "nodeId" $nodeId "minioserver" $minioserver -}}
   {{ include "fullstack.sidecars.eventStreamUploader" $data | nindent 0 }}
   {{- end }}
-  {{- if default $defaults.sidecars.accountBalanceUploader.enable $balanceUploader.enable | eq "true" }}
+  {{- if default $defaults.sidecars.accountBalanceUploader.enabled $balanceUploader.enabled | eq "true" }}
   # Sidecar: Account Balance Uploader
   {{- $data := dict "balanceUploader" $balanceUploader "cloud" $cloud "chart" $chart "defaults" $defaults.sidecars.accountBalanceUploader  "nodeId" $nodeId "minioserver" $minioserver -}}
   {{ include "fullstack.sidecars.accountBalanceUploader" $data | nindent 0 }}
   {{- end }}
-  {{- if default $defaults.sidecars.backupUploader.enable  $backupUploader.enable | eq "true" }}
+  {{- if default $defaults.sidecars.backupUploader.enabled $backupUploader.enabled | eq "true" }}
   # Sidecar: Backup Uploader
   {{- $data := dict "backupUploader" $backupUploader "cloud" $cloud "chart" $chart "defaults" $defaults.sidecars.backupUploader -}}
   {{ include "fullstack.sidecars.backupUploader " $data | nindent 0 }}
   {{- end }}
-  {{- if default $defaults.sidecars.otelCollector.enable  $otelCollector.enable | eq "true" }}
+  {{- if default $defaults.sidecars.otelCollector.enabled $otelCollector.enabled | eq "true" }}
   # Sidecar: OTel Collector
   {{- $data := dict "otel" $otelCollector "chart" $chart "defaults" $defaults.sidecars.otelCollector -}}
   {{ include "fullstack.sidecars.otelCollector" $data | nindent 0 }}

charts/fullstack-deployment/templates/telemetry/prometheus-svc-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if $.Values.telemetry.prometheus.svcMonitor.enable | eq "true" }}
+{{- if $.Values.telemetry.prometheus.svcMonitor.enabled | eq "true" }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/fullstack-deployment/tests/test_gateway_api_deployment.bats

@@ -23,7 +23,7 @@ setup() {
       [[ -z "${node_name}" ]] && test_status="${FAIL}" && break
 
       local route_name="envoy-grpc-web-route-${node_name}"
-      local is_enabled=$(is_enabled_for_node "${node_name}" ".envoyProxy.enable")
+      local is_enabled=$(is_enabled_for_node "${node_name}" ".envoyProxy.enabled")
       if [ "${is_enabled}" = "TRUE" ]; then
         log_debug "EnvoyProxy enabled for node '${node_name}'"
         log_debug "Checking Envoy proxy httproute '${route_name}'"
@@ -62,7 +62,7 @@ setup() {
       [[ -z "${node_name}" ]] && test_status="${FAIL}" && break
 
       local route_name="haproxy-grpc-route-${node_name}"
-      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enable")
+      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enabled")
       if [ "${is_enabled}" = "TRUE" ]; then
         log_debug "HAProxy enabled for node '${node_name}'"
         log_debug "Checking HAProxy GRPC route '${route_name}'"
@@ -101,7 +101,7 @@ setup() {
       [[ -z "${node_name}" ]] && test_status="${FAIL}" && break
 
       local route_name="node-grpc-route-${node_name}"
-      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enable")
+      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enabled")
       if [ "${is_enabled}" = "FALSE" ]; then
         log_debug "Checking Node GRPC route '${route_name}'"
         is_route_accepted "tcproute" "${route_name}" || test_status="${FAIL}"

charts/fullstack-deployment/tests/test_proxy_deployment.bats

@@ -22,7 +22,7 @@ setup() {
       local node_name=$(get_pod_label "${pod}" "fullstack.hedera.com/node-name")
       [[ -z "${node_name}" ]] && test_status="${FAIL}" && break
 
-      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enable")
+      local is_enabled=$(is_enabled_for_node "${node_name}" ".haproxy.enabled")
       if [ "${is_enabled}" = "TRUE" ]; then
         log_debug "HAProxy is enabled for node '${node_name}'"
         log_debug "Checking HAProxy for network-node '${node_name}'"
@@ -63,7 +63,7 @@ setup() {
       local node_name=$(get_pod_label "${pod}" "fullstack.hedera.com/node-name")
       [[ -z "${node_name}" ]] && test_status="${FAIL}" && break
 
-      local is_enabled=$(is_enabled_for_node "${node_name}" ".envoyProxy.enable")
+      local is_enabled=$(is_enabled_for_node "${node_name}" ".envoyProxy.enabled")
       if [ "${is_enabled}" = "TRUE" ]; then
         log_debug "EnvoyProxy is enabled for node '${node_name}'"
         log_debug "Checking Envoy proxy for network-node '${node_name}'"

charts/fullstack-deployment/tests/test_sidecar_deployment.bats

@@ -50,35 +50,35 @@ function run_default_sidecar_check() {
 
 @test "Check record-stream-uploader sidecar" {
   local sidecar_name="record-stream-uploader"
-  local enable_config_path=".defaults.sidecars.recordStreamUploader.enable"
+  local enable_config_path=".defaults.sidecars.recordStreamUploader.enabled"
 
   run_default_sidecar_check "${sidecar_name}" "${enable_config_path}"
 }
 
 @test "Check event-stream-uploader sidecar" {
   local sidecar_name="event-stream-uploader"
-  local enable_config_path=".defaults.sidecars.eventStreamUploader.enable"
+  local enable_config_path=".defaults.sidecars.eventStreamUploader.enabled"
 
   run_default_sidecar_check "${sidecar_name}" "${enable_config_path}"
 }
 
 @test "Check account-balance-uploader sidecar" {
   local sidecar_name="account-balance-uploader"
-  local enable_config_path=".defaults.sidecars.accountBalanceUploader.enable"
+  local enable_config_path=".defaults.sidecars.accountBalanceUploader.enabled"
 
   run_default_sidecar_check "${sidecar_name}" "${enable_config_path}"
 }
 
 @test "Check backup-uploader sidecar" {
   local sidecar_name="backup-uploader"
-  local enable_config_path=".defaults.sidecars.backupUploader.enable"
+  local enable_config_path=".defaults.sidecars.backupUploader.enabled"
 
   run_default_sidecar_check "${sidecar_name}" "${enable_config_path}"
 }
 
 @test "Check otel-collector sidecar" {
   local sidecar_name="otel-collector"
-  local enable_config_path=".defaults.sidecars.otelCollector.enable"
+  local enable_config_path=".defaults.sidecars.otelCollector.enabled"
 
   run_default_sidecar_check "${sidecar_name}" "${enable_config_path}"
 }