From 3175e4b58b2f2bb1e3e16495eac3937d75f9b858 Mon Sep 17 00:00:00 2001
From: Matt Halder <rustyShacklefurd@users.noreply.github.com>
Date: Mon, 11 Sep 2023 13:04:02 -0600
Subject: [PATCH] Updating the configmap setup to take any ENV that is in the
 .Values.config for the corresponding chart of relay or relay-websockets

Signed-off-by: Matt Halder <rustyShacklefurd@users.noreply.github.com>
---
 .../templates/configmap.yaml                  | 20 +-----------
 .../templates/configmap.yaml                  | 31 +------------------
 2 files changed, 2 insertions(+), 49 deletions(-)

diff --git a/charts/hedera-json-rpc-relay-websocket/templates/configmap.yaml b/charts/hedera-json-rpc-relay-websocket/templates/configmap.yaml
index ac569de5eb..03d6ce5d80 100644
--- a/charts/hedera-json-rpc-relay-websocket/templates/configmap.yaml
+++ b/charts/hedera-json-rpc-relay-websocket/templates/configmap.yaml
@@ -6,22 +6,4 @@ metadata:
     app:  {{ template "json-rpc-relay-ws.name" . }}
     {{ include "json-rpc-relay-ws.labels" . | nindent 4 }}
 data:
-  CHAIN_ID: {{ .Values.config.CHAIN_ID | quote }}
-  DEV_MODE: {{ .Values.config.DEV_MODE | quote }}
-  HEDERA_NETWORK: {{ required "A valid HEDERA_NETWORK must be present in" .Values.config.HEDERA_NETWORK | toJson | quote }}
-  MIRROR_NODE_LIMIT_PARAM: {{ .Values.config.MIRROR_NODE_LIMIT_PARAM | quote }}
-  MIRROR_NODE_RETRIES: {{ .Values.config.MIRROR_NODE_RETRIES | quote }}
-  MIRROR_NODE_RETRY_DELAY: {{ .Values.config.MIRROR_NODE_RETRY_DELAY | quote }}
-  MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL | quote }}
-  SUBSCRIPTIONS_ENABLED: "true"
-  WEB_SOCKET_HTTP_PORT: {{ .Values.config.WEB_SOCKET_HTTP_PORT | quote }}
-  WEB_SOCKET_PORT: {{ .Values.config.WEB_SOCKET_PORT | quote }}
-  WS_CONNECTION_LIMIT_PER_IP: {{ .Values.config.WS_CONNECTION_LIMIT_PER_IP | quote }}
-  WS_CONNECTION_LIMIT: {{ .Values.config.WS_CONNECTION_LIMIT | quote }}
-  WS_MAX_INACTIVITY_TTL: {{ .Values.config.WS_MAX_INACTIVITY_TTL | quote }}
-  WS_MULTIPLE_ADDRESSES_ENABLED: {{ .Values.config.WS_MULTIPLE_ADDRESSES_ENABLED | quote }}
-  WS_SUBSCRIPTION_LIMIT: {{ .Values.config.WS_SUBSCRIPTION_LIMIT | quote }}
-  WS_PING_INTERVAL: {{ .Values.config.WS_PING_INTERVAL | quote }}
-  REDIS_ENABLED: {{ .Values.config.REDIS_ENABLED | quote }}
-  REDIS_URL: {{ .Values.config.REDIS_URL | quote }}
-  REDIS_RECONNECT_DELAY_MS: {{ .Values.config.REDIS_RECONNECT_DELAY_MS | quote }}
+  {{ .Values.config | toYaml | nindent 2 }}
diff --git a/charts/hedera-json-rpc-relay/templates/configmap.yaml b/charts/hedera-json-rpc-relay/templates/configmap.yaml
index 18b548ccef..057c1ebe1b 100644
--- a/charts/hedera-json-rpc-relay/templates/configmap.yaml
+++ b/charts/hedera-json-rpc-relay/templates/configmap.yaml
@@ -6,33 +6,4 @@ metadata:
     app:  {{ template "json-rpc-relay.name" . }}
     {{ include "json-rpc-relay.labels" . | nindent 4 }}
 data:
-  CHAIN_ID: {{ .Values.config.CHAIN_ID | quote }}
-  CONSENSUS_MAX_EXECUTION_TIME: {{ .Values.config.CONSENSUS_MAX_EXECUTION_TIME | quote }}
-  CONTRACT_QUERY_TIMEOUT_RETRIES: {{ .Values.config.CONTRACT_QUERY_TIMEOUT_RETRIES | quote }}
-  DEFAULT_RATE_LIMIT: {{ .Values.config.DEFAULT_RATE_LIMIT | quote }}
-  DEV_MODE: {{ .Values.config.DEV_MODE | quote }}
-  ETH_CALL_CACHE_TTL: {{ .Values.config.ETH_CALL_CACHE_TTL | quote }}
-  ETH_CALL_DEFAULT_TO_CONSENSUS_NODE: {{ .Values.config.ETH_CALL_DEFAULT_TO_CONSENSUS_NODE | quote }}
-  ETH_GET_LOGS_BLOCK_RANGE_LIMIT: {{ .Values.config.ETH_GET_LOGS_BLOCK_RANGE_LIMIT | quote }}
-  HBAR_RATE_LIMIT_TINYBAR: {{ .Values.config.HBAR_RATE_LIMIT_TINYBAR | quote }}
-  HBAR_RATE_LIMIT_DURATION: {{ .Values.config.HBAR_RATE_LIMIT_DURATION | quote }}
-  HEDERA_NETWORK: {{ required "A valid HEDERA_NETWORK must be present in" .Values.config.HEDERA_NETWORK | toJson | quote }}
-  INPUT_SIZE_LIMIT: {{ .Values.config.INPUT_SIZE_LIMIT | quote }}
-  LIMIT_DURATION: {{ .Values.config.LIMIT_DURATION | quote }}
-  MIRROR_NODE_LIMIT_PARAM: {{ .Values.config.MIRROR_NODE_LIMIT_PARAM | quote }}
-  MIRROR_NODE_RETRIES: {{ .Values.config.MIRROR_NODE_RETRIES | quote }}
-  MIRROR_NODE_RETRY_DELAY: {{ .Values.config.MIRROR_NODE_RETRY_DELAY | quote }}
-  MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL | quote }}
-  RATE_LIMIT_DISABLED: {{ .Values.config.RATE_LIMIT_DISABLED | quote }}
-  SERVER_PORT: {{ .Values.config.SERVER_PORT | quote }}
-  SUBSCRIPTIONS_ENABLED: {{ .Values.config.SUBSCRIPTIONS_ENABLED | quote }}
-  TIER_1_RATE_LIMIT: {{ .Values.config.TIER_1_RATE_LIMIT | quote }}
-  TIER_2_RATE_LIMIT: {{ .Values.config.TIER_2_RATE_LIMIT | quote }}
-  TIER_3_RATE_LIMIT: {{ .Values.config.TIER_3_RATE_LIMIT | quote }}
-  WEB_SOCKET_PORT: {{ .Values.config.WEB_SOCKET_PORT | quote }}
-  HAPI_CLIENT_TRANSACTION_RESET: {{ .Values.config.HAPI_CLIENT_TRANSACTION_RESET | quote }}
-  HAPI_CLIENT_DURATION_RESET: {{ .Values.config.HAPI_CLIENT_DURATION_RESET | quote }}
-  HAPI_CLIENT_ERROR_RESET: {{ .Values.config.HAPI_CLIENT_ERROR_RESET | quote }}
-  REDIS_ENABLED: {{ .Values.config.REDIS_ENABLED | quote }}
-  REDIS_URL: {{ .Values.config.REDIS_URL | quote }}
-  REDIS_RECONNECT_DELAY_MS: {{ .Values.config.REDIS_RECONNECT_DELAY_MS | quote }}
+  {{ .Values.config | toYaml | nindent 2 }}