From e4885374c9b2dfeabe478f2aa1bc79f5de55cb32 Mon Sep 17 00:00:00 2001 From: Quan Nguyen Date: Wed, 1 Nov 2023 15:34:57 -0500 Subject: [PATCH] chore: rename enable parameter to enabled (#478) Signed-off-by: Quan Nguyen --- charts/fullstack-cluster-setup/Chart.yaml | 6 +-- charts/fullstack-cluster-setup/values.yaml | 6 +-- charts/fullstack-deployment/Chart.yaml | 6 +-- .../config-files/otel-collector-config.yaml | 4 +- .../gateway-api/envoy-grpc-web-routes.yaml | 2 +- .../templates/gateway-api/gateway.yaml | 16 +++--- .../gateway-api/haproxy-grpc-routes.yaml | 2 +- .../gateway-api/network-node-grpc-routes.yaml | 2 +- .../templates/network-node-statefulset.yaml | 2 +- .../templates/proxy/envoy-deployment.yaml | 2 +- .../templates/proxy/haproxy-deployment.yaml | 2 +- .../templates/services/envoy-svc.yaml | 2 +- .../templates/services/haproxy-svc.yaml | 2 +- .../sidecars/_account-balance-uploader.tpl | 2 +- .../sidecars/_event-stream-uploader.tpl | 2 +- .../sidecars/_record-stream-uploader.tpl | 2 +- .../templates/sidecars/_sidecars.tpl | 10 ++-- .../telemetry/prometheus-svc-monitor.yaml | 2 +- .../tests/test_gateway_api_deployment.bats | 6 +-- .../tests/test_proxy_deployment.bats | 4 +- .../tests/test_sidecar_deployment.bats | 10 ++-- charts/fullstack-deployment/values.yaml | 50 +++++++++---------- dev/Makefile | 4 +- .../src/commands/chart.mjs | 2 +- 24 files changed, 74 insertions(+), 74 deletions(-) diff --git a/charts/fullstack-cluster-setup/Chart.yaml b/charts/fullstack-cluster-setup/Chart.yaml index 1ca8ce9f3..b5d42f837 100644 --- a/charts/fullstack-cluster-setup/Chart.yaml +++ b/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 diff --git a/charts/fullstack-cluster-setup/values.yaml b/charts/fullstack-cluster-setup/values.yaml index 6cc07c7f3..e612c6619 100644 --- a/charts/fullstack-cluster-setup/values.yaml +++ b/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 diff --git a/charts/fullstack-deployment/Chart.yaml b/charts/fullstack-deployment/Chart.yaml index 887c6662a..67f7591b0 100644 --- a/charts/fullstack-deployment/Chart.yaml +++ b/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 diff --git a/charts/fullstack-deployment/config-files/otel-collector-config.yaml b/charts/fullstack-deployment/config-files/otel-collector-config.yaml index f2f31b33a..b540aa169 100644 --- a/charts/fullstack-deployment/config-files/otel-collector-config.yaml +++ b/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 }} diff --git a/charts/fullstack-deployment/templates/gateway-api/envoy-grpc-web-routes.yaml b/charts/fullstack-deployment/templates/gateway-api/envoy-grpc-web-routes.yaml index 7485037f8..28080cfdd 100644 --- a/charts/fullstack-deployment/templates/gateway-api/envoy-grpc-web-routes.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/gateway-api/gateway.yaml b/charts/fullstack-deployment/templates/gateway-api/gateway.yaml index 2fdff18e8..6deb0890e 100644 --- a/charts/fullstack-deployment/templates/gateway-api/gateway.yaml +++ b/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 }} diff --git a/charts/fullstack-deployment/templates/gateway-api/haproxy-grpc-routes.yaml b/charts/fullstack-deployment/templates/gateway-api/haproxy-grpc-routes.yaml index ae775bbf5..f19259a6b 100644 --- a/charts/fullstack-deployment/templates/gateway-api/haproxy-grpc-routes.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/gateway-api/network-node-grpc-routes.yaml b/charts/fullstack-deployment/templates/gateway-api/network-node-grpc-routes.yaml index 214997dc2..e023a6293 100644 --- a/charts/fullstack-deployment/templates/gateway-api/network-node-grpc-routes.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/network-node-statefulset.yaml b/charts/fullstack-deployment/templates/network-node-statefulset.yaml index 8ff53dd35..42d8f788c 100644 --- a/charts/fullstack-deployment/templates/network-node-statefulset.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/proxy/envoy-deployment.yaml b/charts/fullstack-deployment/templates/proxy/envoy-deployment.yaml index ce89b6471..a0e3a957c 100644 --- a/charts/fullstack-deployment/templates/proxy/envoy-deployment.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/proxy/haproxy-deployment.yaml b/charts/fullstack-deployment/templates/proxy/haproxy-deployment.yaml index 198b7a273..b21e27c71 100644 --- a/charts/fullstack-deployment/templates/proxy/haproxy-deployment.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/services/envoy-svc.yaml b/charts/fullstack-deployment/templates/services/envoy-svc.yaml index 082103dda..3a381144c 100644 --- a/charts/fullstack-deployment/templates/services/envoy-svc.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/services/haproxy-svc.yaml b/charts/fullstack-deployment/templates/services/haproxy-svc.yaml index 248083a6b..a5b0a835c 100644 --- a/charts/fullstack-deployment/templates/services/haproxy-svc.yaml +++ b/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 diff --git a/charts/fullstack-deployment/templates/sidecars/_account-balance-uploader.tpl b/charts/fullstack-deployment/templates/sidecars/_account-balance-uploader.tpl index 162f69fb9..9b0c30ba5 100644 --- a/charts/fullstack-deployment/templates/sidecars/_account-balance-uploader.tpl +++ b/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 diff --git a/charts/fullstack-deployment/templates/sidecars/_event-stream-uploader.tpl b/charts/fullstack-deployment/templates/sidecars/_event-stream-uploader.tpl index 556138def..c0a7b2e62 100644 --- a/charts/fullstack-deployment/templates/sidecars/_event-stream-uploader.tpl +++ b/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 diff --git a/charts/fullstack-deployment/templates/sidecars/_record-stream-uploader.tpl b/charts/fullstack-deployment/templates/sidecars/_record-stream-uploader.tpl index ca9ef4cdb..7a8468a02 100644 --- a/charts/fullstack-deployment/templates/sidecars/_record-stream-uploader.tpl +++ b/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 diff --git a/charts/fullstack-deployment/templates/sidecars/_sidecars.tpl b/charts/fullstack-deployment/templates/sidecars/_sidecars.tpl index 4117723c3..50fd7278f 100644 --- a/charts/fullstack-deployment/templates/sidecars/_sidecars.tpl +++ b/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 }} diff --git a/charts/fullstack-deployment/templates/telemetry/prometheus-svc-monitor.yaml b/charts/fullstack-deployment/templates/telemetry/prometheus-svc-monitor.yaml index f990545ea..1acec59ef 100644 --- a/charts/fullstack-deployment/templates/telemetry/prometheus-svc-monitor.yaml +++ b/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: diff --git a/charts/fullstack-deployment/tests/test_gateway_api_deployment.bats b/charts/fullstack-deployment/tests/test_gateway_api_deployment.bats index 3db9fe4cb..338eeaec4 100644 --- a/charts/fullstack-deployment/tests/test_gateway_api_deployment.bats +++ b/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}" diff --git a/charts/fullstack-deployment/tests/test_proxy_deployment.bats b/charts/fullstack-deployment/tests/test_proxy_deployment.bats index de65494b1..7afedd7c5 100644 --- a/charts/fullstack-deployment/tests/test_proxy_deployment.bats +++ b/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}'" diff --git a/charts/fullstack-deployment/tests/test_sidecar_deployment.bats b/charts/fullstack-deployment/tests/test_sidecar_deployment.bats index e45558b41..d99e39172 100644 --- a/charts/fullstack-deployment/tests/test_sidecar_deployment.bats +++ b/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}" } diff --git a/charts/fullstack-deployment/values.yaml b/charts/fullstack-deployment/values.yaml index e4a77acaf..b46f3ca97 100644 --- a/charts/fullstack-deployment/values.yaml +++ b/charts/fullstack-deployment/values.yaml @@ -9,17 +9,17 @@ cloud: streamBucket: "fst-streams" backupBucket: "fst-backups" s3: - enable: "true" + enabled: "true" gcs: - enable: "true" + enabled: "true" minio: - enable: true + enabled: true # telemetry configurations telemetry: prometheus: svcMonitor: - enable: "true" + enabled: "true" # reduce default termination grace period terminationGracePeriodSeconds: 10 @@ -41,29 +41,29 @@ gatewayApi: name: "fst-gateway-class" # this is a shared gateway class for all namespaces gateway: name: "fst" - enable: "true" + enabled: "true" listeners: gossip: port: 51000 # i.e. node0:51000 ... node999: 51999, points to 50111 port in haproxy or network-node - enable: "false" # by default, we don't need to expose the gossip ports + enabled: "false" # by default, we don't need to expose the gossip ports grpc: # non-tls-grpc-port port: 52000 # i.e. node0:52000 ... node999: 52999, points to 50211 port in haproxy or network-node - enable: "true" + enabled: "true" grpcs: # tls-grpc-port port: 53000 # i.e. node0:53000 ... node999: 53999, points to 50212 port in haproxy or network-node - enable: "true" + enabled: "true" grpcWeb: port: 18000 # i.e. node0:18000 ... node999: 18999, points to 8080 port in envoy proxy - enable: "true" + enabled: "true" httpDebug: # this helps debugging gateway if needed by provisioning a mock http app port: 3100 - enable: "true" + enabled: "true" tcpDebug: # this helps debugging gateway if needed by provisioning a mock grpc app port: 3101 - enable: "true" + enabled: "true" hederaExplorer: port: 8888 # points to 80 port on fst-hedera-explorer - enable: "true" + enabled: "true" route: hostname: "{{ .node.name }}.fst.local" @@ -85,7 +85,7 @@ defaults: pullPolicy: "IfNotPresent" resources: {} haproxy: - enable: "true" + enabled: "true" nameOverride: "haproxy" image: registry: "docker.io" @@ -95,7 +95,7 @@ defaults: resources: {} loadBalancerEnabled: "false" envoyProxy: - enable: "true" + enabled: "true" nameOverride: "envoy-proxy" image: registry: "docker.io" @@ -106,7 +106,7 @@ defaults: loadBalancerEnabled: "false" sidecars: recordStreamUploader: - enable: "true" + enabled: "true" nameOverride: "record-stream-uploader" image: registry: "gcr.io" @@ -118,7 +118,7 @@ defaults: compression: "true" sidecar: "true" reaper: - enable: "true" + enabled: "true" minKeep: 1 interval: 1 defaultBackoff: 1 @@ -127,7 +127,7 @@ defaults: prioritize: "true" resources: {} eventStreamUploader: - enable: "true" + enabled: "true" nameOverride: "event-stream-uploader" image: registry: "gcr.io" @@ -138,7 +138,7 @@ defaults: debug: "true" compression: "true" reaper: - enable: "true" + enabled: "true" minKeep: 1 interval: 1 defaultBackoff: 1 @@ -147,7 +147,7 @@ defaults: prioritize: "true" resources: {} accountBalanceUploader: - enable: "true" + enabled: "true" nameOverride: "account-balance-uploader" image: registry: gcr.io @@ -158,7 +158,7 @@ defaults: debug: "true" compression: "true" reaper: - enable: "true" + enabled: "true" minKeep: 1 interval: 1 defaultBackoff: 1 @@ -167,7 +167,7 @@ defaults: prioritize: "true" resources: {} backupUploader: - enable: "true" + enabled: "true" nameOverride: "backup-uploader" image: registry: "gcr.io" @@ -178,7 +178,7 @@ defaults: backupBucket: "backup" resources: {} otelCollector: - enable: "true" + enabled: "true" nameOverride: "" image: registry: "docker.io" @@ -199,7 +199,7 @@ defaults: tls: insecure: true prometheusRemoteWrite: - enable: "false" + enabled: "false" endpoint: "" # e.g. http://prometheus..svc:9090/api/v1/write tls: insecure: true @@ -238,7 +238,7 @@ minio-server: # hedera mirror node configuration hedera-mirror-node: - enable: true + enabled: true graphql: # not needed for default FST use case enabled: false rosetta: # not needed for default FST use case @@ -365,7 +365,7 @@ hedera-mirror-node: # hedera explorer configuration hedera-explorer: - enable: true + enabled: true nodeSelector: fullstack-scheduling.io/role: network tolerations: diff --git a/dev/Makefile b/dev/Makefile index d8ce56153..564cb423d 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -172,7 +172,7 @@ enable-prometheus-stack-if-required: enable-prometheus-stack: @echo ">> Enabling prometheus stack..."; \ echo " prometheusStack:" >> ${CLUSTER_SETUP_VALUES_FILE}; \ - echo " enable: true" >> ${CLUSTER_SETUP_VALUES_FILE}; + echo " enabled: true" >> ${CLUSTER_SETUP_VALUES_FILE}; .PHONY: is-prometheus-operator-installed is-prometheus-operator-installed: @@ -217,7 +217,7 @@ destroy-telemetry-stack: enable-minio-operator: @echo ">> Enabling minio operator..."; \ echo " minio:" >> ${CLUSTER_SETUP_VALUES_FILE}; \ - echo " enable: true" >> ${CLUSTER_SETUP_VALUES_FILE}; + echo " enabled: true" >> ${CLUSTER_SETUP_VALUES_FILE}; .PHONY: is-minio-operator-installed is-minio-operator-installed: diff --git a/fullstack-network-manager/src/commands/chart.mjs b/fullstack-network-manager/src/commands/chart.mjs index b7e10c457..5662b0d6b 100644 --- a/fullstack-network-manager/src/commands/chart.mjs +++ b/fullstack-network-manager/src/commands/chart.mjs @@ -16,7 +16,7 @@ export class ChartCommand extends BaseCommand { valuesArg += ` --values ${valuesFile}` } - valuesArg += ` --set hedera-mirror-node.enable=${mirrorNode} --set hedera-explorer.enable=${hederaExplorer}` + valuesArg += ` --set hedera-mirror-node.enabled=${mirrorNode} --set hedera-explorer.enabled=${hederaExplorer}` return valuesArg }