Skip to content

Commit 2e2f7de

Browse files
TakGNTakGN
committed
change envs names to include BUNDLER prefix
1 parent 941390e commit 2e2f7de

2 files changed

Lines changed: 47 additions & 44 deletions

File tree

‎install-bundler/bundler/install.sh‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -105,24 +105,24 @@ fi
105105

106106
echo ""
107107
echo "Getting secret config data stored in ${GCP_PLAINTEXT_CONFIG_SECRET}"
108-
SIMULATION_DATA_JSON=$(grep SIMULATION_DATA_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
109-
| sed 's/SIMULATION_DATA_JSON=//g')
110-
TOKEN_PRICE_JSON=$(grep TOKEN_PRICE_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
111-
| sed 's/TOKEN_PRICE_JSON=//g')
112-
SLACK_JSON=$(grep SLACK_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
113-
| sed 's/SLACK_JSON=//g')
114-
PROVIDER_JSON=$(grep PROVIDER_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
115-
| sed 's/PROVIDER_JSON=//g')
116-
DATASOURCES_JSON=$(grep DATASOURCES_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
117-
| sed 's/DATASOURCES_JSON=//g')
118-
SOCKET_SERVICE_JSON=$(grep SOCKET_SERVICE_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
119-
| sed 's/SOCKET_SERVICE_JSON=//g')
120-
QUEUE_URL=$(grep QUEUE_URL <<< "${GCP_SECRET_CONFIG_VALUE}" \
121-
| sed 's/QUEUE_URL=//g')
108+
BUNDLER_SIMULATION_DATA_JSON=$(grep BUNDLER_SIMULATION_DATA_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
109+
| sed 's/BUNDLER_SIMULATION_DATA_JSON=//g')
110+
BUNDLER_TOKEN_PRICE_JSON=$(grep BUNDLER_TOKEN_PRICE_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
111+
| sed 's/BUNDLER_TOKEN_PRICE_JSON=//g')
112+
BUNDLER_SLACK_JSON=$(grep BUNDLER_SLACK_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
113+
| sed 's/BUNDLER_SLACK_JSON=//g')
114+
BUNDLER_PROVIDER_JSON=$(grep BUNDLER_PROVIDER_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
115+
| sed 's/BUNDLER_PROVIDER_JSON=//g')
116+
BUNDLER_DATASOURCES_JSON=$(grep BUNDLER_DATASOURCES_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
117+
| sed 's/BUNDLER_DATASOURCES_JSON=//g')
118+
BUNDLER_SOCKET_SERVICE_JSON=$(grep BUNDLER_SOCKET_SERVICE_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
119+
| sed 's/BUNDLER_SOCKET_SERVICE_JSON=//g')
120+
BUNDLER_QUEUE_URL=$(grep BUNDLER_QUEUE_URL <<< "${GCP_SECRET_CONFIG_VALUE}" \
121+
| sed 's/BUNDLER_QUEUE_URL=//g')
122122
BUNDLER_IS_TRUSTWALLET_SETUP=$(grep BUNDLER_IS_TRUSTWALLET_SETUP <<< "${GCP_SECRET_CONFIG_VALUE}" \
123123
| sed 's/BUNDLER_IS_TRUSTWALLET_SETUP=//g')
124-
BUNDLER_FALLBACK=$(grep BUNDLER_FALLBACK <<< "${GCP_SECRET_CONFIG_VALUE}" \
125-
| sed 's/BUNDLER_FALLBACK=//g')
124+
BUNDLER_FALLBACK=$(grep BUNDLER_FALLBACK_PROVIDER_JSON <<< "${GCP_SECRET_CONFIG_VALUE}" \
125+
| sed 's/BUNDLER_FALLBACK_PROVIDER_JSON=//g')
126126

127127
if ! kubectl get namespace "${NAMESPACE}"; then
128128
echo "Error: ${NAMESPACE} doesnt exists, creating it now"
@@ -199,12 +199,12 @@ for array_name in $array_names; do
199199
print_green "FUNDING_RELAYER_AMOUNT=$FUNDING_RELAYER_AMOUNT"
200200
print_green "ADJ_AUTOSCALING_THRESHHOLD_HTTP_REQUESTS=${ADJ_AUTOSCALING_THRESHHOLD_HTTP_REQUESTS}"
201201

202-
ENCODED_SIMULATION_DATA_JSON=$(echo -n "$SIMULATION_DATA_JSON" | base64)
203-
ENCODED_TOKEN_PRICE_JSON=$(echo -n "$TOKEN_PRICE_JSON" | base64)
204-
ENCODED_SLACK_JSON=$(echo -n "$SLACK_JSON" | base64)
205-
ENCODED_PROVIDER_JSON=$(echo -n "$PROVIDER_JSON" | base64)
206-
ENCODED_DATASOURCES_JSON=$(echo -n "$DATASOURCES_JSON" | base64)
207-
ENCODED_SOCKET_SERVICE_JSON=$(echo -n "$SOCKET_SERVICE_JSON" | base64)
202+
ENCODED_BUNDLER_SIMULATION_DATA_JSON=$(echo -n "$BUNDLER_SIMULATION_DATA_JSON" | base64)
203+
ENCODED_BUNDLER_TOKEN_PRICE_JSON=$(echo -n "$BUNDLER_TOKEN_PRICE_JSON" | base64)
204+
ENCODED_BUNDLER_SLACK_JSON=$(echo -n "$BUNDLER_SLACK_JSON" | base64)
205+
ENCODED_BUNDLER_PROVIDER_JSON=$(echo -n "$BUNDLER_PROVIDER_JSON" | base64)
206+
ENCODED_BUNDLER_DATASOURCES_JSON=$(echo -n "$BUNDLER_DATASOURCES_JSON" | base64)
207+
ENCODED_BUNDLER_SOCKET_SERVICE_JSON=$(echo -n "$BUNDLER_SOCKET_SERVICE_JSON" | base64)
208208
ENCODED_BUNDLER_IS_TRUSTWALLET_SETUP=$(echo -n "$BUNDLER_IS_TRUSTWALLET_SETUP" | base64)
209209
ENCODED_BUNDLER_FALLBACK_PROVIDER_JSON=$(echo -n "$BUNDLER_FALLBACK" | base64)
210210
echo ""
@@ -223,6 +223,7 @@ for array_name in $array_names; do
223223
--set CHAIN_ID="$CHAIN_ID" \
224224
--set provider="$PROVIDER" \
225225
--set prometheus.enabled=true \
226+
--set nodePathIndex=0 \
226227
--set hpa.average_http_requests_hpa="${ADJ_AUTOSCALING_THRESHHOLD_HTTP_REQUESTS}" \
227228
--set hpa.average_cpu_hpa="$AUTOSCALING_THRESHHOLD_CPU" \
228229
--set-string image.name="$IMAGE" \
@@ -231,15 +232,15 @@ for array_name in $array_names; do
231232
--set-string maxRelayerCount="$MAX_RELAYER_COUNT" \
232233
--set-string fundingBalanceThreshold="$FUNDING_BALANCE_THRESHOLD" \
233234
--set-string fundingRelayerAmount="$FUNDING_RELAYER_AMOUNT" \
234-
--set-string encodedSimulationDataJson="$ENCODED_SIMULATION_DATA_JSON" \
235-
--set-string encodedTokenPriceJson="$ENCODED_TOKEN_PRICE_JSON" \
236-
--set-string encodedSlackJson="$ENCODED_SLACK_JSON" \
237-
--set-string encodedProviderJson="$ENCODED_PROVIDER_JSON" \
238-
--set-string encodedDatasourcesJson="$ENCODED_DATASOURCES_JSON" \
239-
--set-string encodedSocketServiceJson="$ENCODED_SOCKET_SERVICE_JSON" \
240-
--set-string queueUrl="$QUEUE_URL" \
241-
--set-string encodedIsTrustWalletSetup="$ENCODED_BUNDLER_IS_TRUSTWALLET_SETUP" \
242-
--set-string encodedFallbackProviderJson="$ENCODED_BUNDLER_FALLBACK_PROVIDER_JSON" \
235+
--set-string encodedBundlerSimulationDataJson="$ENCODED_BUNDLER_SIMULATION_DATA_JSON" \
236+
--set-string encodedBundlerTokenPriceJson="$ENCODED_BUNDLER_TOKEN_PRICE_JSON" \
237+
--set-string encodedBundlerSlackJson="$ENCODED_BUNDLER_SLACK_JSON" \
238+
--set-string encodedBundlerProviderJson="$ENCODED_BUNDLER_PROVIDER_JSON" \
239+
--set-string encodedBundlerDatasourcesJson="$ENCODED_BUNDLER_DATASOURCES_JSON" \
240+
--set-string encodedBundlerSocketServiceJson="$ENCODED_BUNDLER_SOCKET_SERVICE_JSON" \
241+
--set-string bundlerQueueUrl="$BUNDLER_QUEUE_URL" \
242+
--set-string encodedBundlerIsTrustWalletSetup="$ENCODED_BUNDLER_IS_TRUSTWALLET_SETUP" \
243+
--set-string encodedBundlerFallbackProviderJson="$ENCODED_BUNDLER_FALLBACK_PROVIDER_JSON" \
243244
--set-string gcpSecretManagerName="$GCP_SECRETS_MANAGER_NAME" \
244245
--set-string hpa.minReplicas="$MIN_REPLICA" \
245246
--set-string hpa.maxReplicas="$MAX_REPLICA" \

‎install-bundler/bundler/templates/envConfigMap.yaml‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@ kind: ConfigMap
44
metadata:
55
{{ include "chart.staticconfigmap.metadata" . | nindent 2 }}
66
data:
7-
MIN_RELAYER_COUNT: "{{ .Values.minRelayerCount }}"
8-
MAX_RELAYER_COUNT: "{{ .Values.maxRelayerCount }}"
9-
FUNDING_BALANCE_THRESHOLD: "{{ .Values.fundingBalanceThreshold}}"
10-
FUNDING_RELAYER_AMOUNT: "{{ .Values.fundingRelayerAmount }}"
11-
QUEUE_URL: {{.Values.queueUrl}}
12-
SIMULATION_DATA_JSON: {{ .Values.encodedSimulationDataJson | b64dec }}
13-
TOKEN_PRICE_JSON: {{ .Values.encodedTokenPriceJson | b64dec }}
14-
SLACK_JSON: {{ .Values.encodedSlackJson | b64dec }}
15-
PROVIDER_JSON: {{ .Values.encodedProviderJson | b64dec }}
16-
DATASOURCES_JSON: {{ .Values.encodedDatasourcesJson | b64dec }}
17-
SOCKET_SERVICE_JSON: {{ .Values.encodedSocketServiceJson | b64dec }}
18-
BUNDLER_IS_TRUSTWALLET_SETUP: {{ .Values.encodedIsTrustWalletSetup | b64dec }}
19-
BUNDLER_FALLBACK_PROVIDER_JSON: {{ .Values.encodedFallbackProviderJson | b64dec }}
7+
BUNDLER_MIN_RELAYER_COUNT: "{{ .Values.minRelayerCount }}"
8+
BUNDLER_MAX_RELAYER_COUNT: "{{ .Values.maxRelayerCount }}"
9+
BUNDLER_FUNDING_BALANCE_THRESHOLD: "{{ .Values.fundingBalanceThreshold}}"
10+
BUNDLER_FUNDING_RELAYER_AMOUNT: "{{ .Values.fundingRelayerAmount }}"
11+
BUNDLER_QUEUE_URL: {{.Values.bundlerQueueUrl}}
12+
BUNDLER_SIMULATION_DATA_JSON: {{ .Values.encodedBundlerSimulationDataJson | b64dec }}
13+
BUNDLER_TOKEN_PRICE_JSON: {{ .Values.encodedBundlerTokenPriceJson | b64dec }}
14+
BUNDLER_SLACK_JSON: {{ .Values.encodedBundlerSlackJson | b64dec }}
15+
BUNDLER_PROVIDER_JSON: {{ .Values.encodedBundlerProviderJson | b64dec }}
16+
BUNDLER_DATASOURCES_JSON: {{ .Values.encodedBundlerDatasourcesJson | b64dec }}
17+
BUNDLER_SOCKET_SERVICE_JSON: {{ .Values.encodedBundlerSocketServiceJson | b64dec }}
18+
BUNDLER_IS_TRUSTWALLET_SETUP: {{ .Values.encodedBundlerIsTrustWalletSetup | b64dec }}
19+
BUNDLER_FALLBACK_PROVIDER_JSON: {{ .Values.encodedBundlerFallbackProviderJson | b64dec }}
20+
BUNDLER_CHAIN_ID: "{{ .Values.CHAIN_ID }}"
21+
BUNDLER_NODE_PATH_INDEX: "{{ .Values.nodePathIndex }}"
2022
DD_PROFILING_ENABLED: "false"
2123
DD_ENV: "bundler-tw-staging"
2224
DD_SERVICE: {{.Values.datadog.service}}

0 commit comments

Comments
 (0)