Skip to content

Commit 4c3191c

Browse files
rustyShacklefurdrustyShacklefurd
authored
Config variable handling update (#451)
* Breaking up the configuration settings into secrets and configmap. Using the secret for the operator id and key. Signed-off-by: Matt Halder <[email protected]> * Deployment.yaml has been updated to use configmap and secrets from the last commit. Values file has settings for using either local or global hedera networks configurations. Signed-off-by: Matt Halder <[email protected]> * Adding support for both local and hosted hedera networks in the configmap. Added test values into minikube values file. Signed-off-by: Matt Halder <[email protected]> * Moving the eth_raw id and key from the configmap to the secrets location for both templates and values. Signed-off-by: Matt Halder <[email protected]> * Adding padded return for linting Signed-off-by: Matt Halder <[email protected]> * moving from rfc 1918 addresses to loopback address, this is how local development nodes are documented to run Signed-off-by: Matt Halder <[email protected]> * moving from rfc 1918 addresses to loopback address, this is how local development nodes are documented to run Signed-off-by: Matt Halder <[email protected]> Signed-off-by: Matt Halder <[email protected]>
1 parent a3499e6 commit 4c3191c

File tree

5 files changed

+76
-32
lines changed

5 files changed

+76
-32
lines changed

‎helm-chart/environments/minikube.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
11
imagePullSecrets:
22
- name: ghcr-registry-auth
3-
3+
4+
config:
5+
# This value should be in decimal, not hexadecimal format.
6+
CHAIN_ID: ""
7+
MIRROR_NODE_URL: ""
8+
LOG_LEVEL: ""
9+
local:
10+
HEDERA_NETWORK: {"127.0.01:50211":"0.0.3"}
11+
12+
secret:
13+
OPERATOR_ID_MAIN: ""
14+
OPERATOR_KEY_MAIN: ""
15+
OPERATOR_ID_ETH_SENDRAWTRANSACTION: ""
16+
OPERATOR_KEY_ETH_SENDRAWTRANSACTION: ""
17+

‎helm-chart/templates/configmap.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: {{ include "json-rpc-relay.fullname" . }}
5+
labels:
6+
app: {{ template "json-rpc-relay.name" . }}
7+
{{ include "json-rpc-relay.labels" . | nindent 4 }}
8+
data:
9+
{{- if .Values.config.local.HEDERA_NETWORK }}
10+
HEDERA_NETWORK: {{ .Values.config.local.HEDERA_NETWORK | toJson }}
11+
{{- else if .Values.config.hosted.HEDERA_NETWORK }}
12+
HEDERA_NETWORK: {{ .Values.config.hosted.HEDERA_NETWORK }}
13+
{{- else }}
14+
HEDERA_NETWORK: {{ required "A valid HEDERA_NETWORK must be present in either .Values.config.local.HEDERA_NETWORK or .Values.config.hosted.HEDERA_NETWORK " (or .Values.config.local.HEDERA_NETWORK .Values.config.hosted.HEDERA_NETWORK) }}
15+
{{- end }}
16+
CHAIN_ID: {{ .valu}}
17+
MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL }}
18+
LOCAL_NODE: {{ .Values.config.LOCAL_NODE }}
19+
SERVER_PORT: {{ .Values.config.SERVER_PORT }}
20+
CHAIN_ID: {{ .Values.config.CHAIN_ID }}
21+

‎helm-chart/templates/deployment.yaml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,18 @@ spec:
3535
imagePullPolicy: {{ .Values.image.pullPolicy }}
3636
env:
3737
- name: CHAIN_ID
38-
value: {{ .Values.config.CHAIN_ID | squote }}
39-
- name: HEDERA_NETWORK
40-
valueFrom:
41-
secretKeyRef:
42-
name: {{ include "json-rpc-relay.fullname" . }}
43-
key: HEDERA_NETWORK
44-
optional: false
45-
- name: OPERATOR_ID_MAIN
38+
value: {{ .Values.config.CHAIN_ID | squote }}
39+
- name: CHAIN_ID
4640
valueFrom:
47-
secretKeyRef:
41+
configMapKeyRef:
4842
name: {{ include "json-rpc-relay.fullname" . }}
49-
key: OPERATOR_ID_MAIN
50-
optional: false
51-
- name: OPERATOR_KEY_MAIN
43+
key: CHAIN_ID
44+
optional: true
45+
- name: HEDERA_NETWORK
5246
valueFrom:
53-
secretKeyRef:
47+
configMapKeyRef:
5448
name: {{ include "json-rpc-relay.fullname" . }}
55-
key: OPERATOR_KEY_MAIN
49+
key: HEDERA_NETWORK
5650
optional: false
5751
- name: OPERATOR_ID_ETH_SENDRAWTRANSACTION
5852
valueFrom:
@@ -68,22 +62,34 @@ spec:
6862
optional: true
6963
- name: MIRROR_NODE_URL
7064
valueFrom:
71-
secretKeyRef:
65+
configMapKeyRef:
7266
name: {{ include "json-rpc-relay.fullname" . }}
7367
key: MIRROR_NODE_URL
7468
optional: false
7569
- name: LOCAL_NODE
7670
valueFrom:
77-
secretKeyRef:
71+
configMapKeyRef:
7872
name: {{ include "json-rpc-relay.fullname" . }}
7973
key: LOCAL_NODE
8074
optional: false
8175
- name: SERVER_PORT
8276
valueFrom:
83-
secretKeyRef:
77+
configMapKeyRef:
8478
name: {{ include "json-rpc-relay.fullname" . }}
8579
key: SERVER_PORT
86-
optional: false
80+
optional: false
81+
- name: OPERATOR_ID_MAIN
82+
valueFrom:
83+
secretKeyRef:
84+
name: {{ include "json-rpc-relay.fullname" . }}
85+
key: OPERATOR_ID_MAIN
86+
optional: false
87+
- name: OPERATOR_KEY_MAIN
88+
valueFrom:
89+
secretKeyRef:
90+
name: {{ include "json-rpc-relay.fullname" . }}
91+
key: OPERATOR_KEY_MAIN
92+
optional: false
8793
ports:
8894
- containerPort: {{ .Values.ports.containerPort }}
8995
name: {{ .Values.ports.name }}

‎helm-chart/templates/secret.yaml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@ metadata:
44
labels: {{ include "json-rpc-relay.labels" . | nindent 4 }}
55
name: {{ include "json-rpc-relay.fullname" . }}
66
type: Opaque
7-
data:
8-
HEDERA_NETWORK: {{ .Values.config.HEDERA_NETWORK | b64enc }}
9-
OPERATOR_ID_MAIN: {{ .Values.config.OPERATOR_ID_MAIN | b64enc }}
10-
OPERATOR_KEY_MAIN: {{ .Values.config.OPERATOR_KEY_MAIN | b64enc }}
7+
stringData:
8+
OPERATOR_ID_MAIN: {{ .Values.config.OPERATOR_ID_MAIN }}
9+
OPERATOR_KEY_MAIN: {{ .Values.config.OPERATOR_KEY_MAIN }}
1110
OPERATOR_ID_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_ID_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
12-
OPERATOR_KEY_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_KEY_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
13-
MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL | b64enc }}
14-
LOCAL_NODE: {{ .Values.config.LOCAL_NODE | quote | b64enc }}
15-
SERVER_PORT: {{ .Values.config.SERVER_PORT | quote | b64enc }}
11+
OPERATOR_KEY_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_KEY_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
1612

‎helm-chart/values.yaml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,20 @@ ports:
8484
containerPort: 7546
8585

8686
config:
87-
HEDERA_NETWORK: ""
88-
OPERATOR_ID_MAIN: ""
89-
OPERATOR_KEY_MAIN: ""
90-
OPERATOR_ID_ETH_SENDRAWTRANSACTION: ""
91-
OPERATOR_KEY_ETH_SENDRAWTRANSACTION: ""
9287
# This value should be in decimal, not hexadecimal format.
9388
CHAIN_ID: ""
9489
MIRROR_NODE_URL: ""
9590
LOG_LEVEL: ""
91+
# Use config.local.HEDERA_NETWORK when running against a locally hosted hedera network
92+
# local:
93+
# config.local.HEDERA_NETWORK should configured as a json set - {"$IPv4_ADDR_1:$PORT_1":"$ACCOUNT_ID_1","$IPv4_ADDR_2:$PORT_2":"$ACCOUNT_ID_2"}
94+
# HEDERA_NETWORK: {"127.0.01:50211":"0.0.3"}
95+
# Use config.hosted.HEDERA_NETWORK when running against a hosted Hedera network. Valid options are `previewnet`, `testnet`, and `mainnet`
96+
# hosted:
97+
# HEDERA_NETWORK: ""
98+
secret:
99+
OPERATOR_ID_MAIN: ""
100+
OPERATOR_KEY_MAIN: ""
101+
OPERATOR_ID_ETH_SENDRAWTRANSACTION: ""
102+
OPERATOR_KEY_ETH_SENDRAWTRANSACTION: ""
96103

0 commit comments

Comments
 (0)