Configmap fix env from change (#767)

* Based on the troubles with deploying and the errors incurred during failed rollouts, I believe we are hitting this issue - kubernetes/kubernetes#46861.  The TL;DR is that due to yaml to json conversion all ENVs need to be quoted or they cause failures to be seen.  Boolean and ints both need to be quoted along with strings; this issue was open in 2017 and still getting comments

Signed-off-by: Matt Halder <[email protected]>

* Remove the annotations_JSON, this can be sent via doubled quoted JSON stated here https://github.com/hashgraph/hedera-json-rpc-relay/pull/522\#discussion_r971487256

Signed-off-by: Matt Halder <[email protected]>

* This change moves to using envFrom and naming the configmap and secret that are used to set ENVs.  This change should make future ENVs additions simpler

Signed-off-by: Matt Halder <[email protected]>

Signed-off-by: Matt Halder <[email protected]>

Author: rustyShacklefurd

helm-chart/templates/configmap.yaml

@@ -7,27 +7,26 @@ metadata:
     {{ include "json-rpc-relay.labels" . | nindent 4 }}
 data:
 {{- if and .Values.config.local .Values.config.local.HEDERA_NETWORK }}
-  HEDERA_NETWORK: {{ .Values.config.local.HEDERA_NETWORK | toJson }}
+  HEDERA_NETWORK: {{ .Values.config.local.HEDERA_NETWORK | toJson | quote}}
 {{- else if .Values.config.hosted.HEDERA_NETWORK }}
-  HEDERA_NETWORK: {{ .Values.config.hosted.HEDERA_NETWORK }}
+  HEDERA_NETWORK: {{ .Values.config.hosted.HEDERA_NETWORK | quote }}
 {{- else }}
   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) }}
 {{- end }}
-  CHAIN_ID: {{ .valu}}
-  MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL  }}
-  LOCAL_NODE: {{ .Values.config.LOCAL_NODE }}
-  SERVER_PORT: {{ .Values.config.SERVER_PORT }}
-  CHAIN_ID: {{ .Values.config.CHAIN_ID }}
-  DEFAULT_RATE_LIMIT: {{ .Values.config.DEFAULT_RATE_LIMIT }}
-  TIER_1_RATE_LIMIT: {{ .Values.config.TIER_1_RATE_LIMIT }}
-  TIER_2_RATE_LIMIT: {{ .Values.config.TIER_2_RATE_LIMIT }}
-  TIER_3_RATE_LIMIT: {{ .Values.config.TIER_3_RATE_LIMIT }}
-  LIMIT_DURATION: {{ .Values.config.LIMIT_DURATION }}
-  HBAR_RATE_LIMIT_TINYBAR: {{ .Values.config.HBAR_RATE_LIMIT_TINYBAR }}
-  HBAR_RATE_LIMIT_DURATION: {{ .Values.config.HBAR_RATE_LIMIT_DURATION }}
-  ETH_GET_LOGS_BLOCK_RANGE_LIMIT: {{ .Values.config.ETH_GET_LOGS_BLOCK_RANGE_LIMIT }}
-  RATE_LIMIT_DISABLED: {{ .Values.config.RATE_LIMIT_DISABLED }}
-  DEV_MODE: {{ .Values.config.DEV_MODE }}
-  MIRROR_NODE_RETRIES: {{ .Values.config.MIRROR_NODE_RETRIES }}
-  MIRROR_NODE_RETRY_DELAY: {{ .Values.config.MIRROR_NODE_RETRY_DELAY }}
-  MIRROR_NODE_LIMIT_PARAM: {{ .Values.config.MIRROR_NODE_LIMIT_PARAM }}
+  MIRROR_NODE_URL: {{ .Values.config.MIRROR_NODE_URL | quote }}
+  LOCAL_NODE: {{ .Values.config.LOCAL_NODE | quote }}
+  SERVER_PORT: {{ .Values.config.SERVER_PORT | quote }}
+  CHAIN_ID: {{ .Values.config.CHAIN_ID | quote }}
+  DEFAULT_RATE_LIMIT: {{ .Values.config.DEFAULT_RATE_LIMIT | 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 }}
+  LIMIT_DURATION: {{ .Values.config.LIMIT_DURATION | quote }}
+  HBAR_RATE_LIMIT_TINYBAR: {{ .Values.config.HBAR_RATE_LIMIT_TINYBAR | quote }}
+  HBAR_RATE_LIMIT_DURATION: {{ .Values.config.HBAR_RATE_LIMIT_DURATION | quote }}
+  ETH_GET_LOGS_BLOCK_RANGE_LIMIT: {{ .Values.config.ETH_GET_LOGS_BLOCK_RANGE_LIMIT | quote }}
+  RATE_LIMIT_DISABLED: {{ .Values.config.RATE_LIMIT_DISABLED | quote }}
+  DEV_MODE: {{ .Values.config.DEV_MODE | quote }}
+  MIRROR_NODE_RETRIES: {{ .Values.config.MIRROR_NODE_RETRIES | quote }}
+  MIRROR_NODE_RETRY_DELAY: {{ .Values.config.MIRROR_NODE_RETRY_DELAY | quote }}
+  MIRROR_NODE_LIMIT_PARAM: {{ .Values.config.MIRROR_NODE_LIMIT_PARAM | quote }}

helm-chart/templates/deployment.yaml

@@ -33,152 +33,11 @@ spec:
       - name: {{ .Chart.Name }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        env:
-          - name: CHAIN_ID
-            value: {{ .Values.config.CHAIN_ID | squote }}
-          - name: CHAIN_ID
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: CHAIN_ID
-                optional: true
-          - name: HEDERA_NETWORK
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: HEDERA_NETWORK
-                optional: false
-          - name: OPERATOR_ID_ETH_SENDRAWTRANSACTION
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: OPERATOR_ID_ETH_SENDRAWTRANSACTION
-                optional: true
-          - name: OPERATOR_KEY_ETH_SENDRAWTRANSACTION
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: OPERATOR_KEY_ETH_SENDRAWTRANSACTION
-                optional: true
-          - name: MIRROR_NODE_URL
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: MIRROR_NODE_URL
-                optional: false
-          - name: LOCAL_NODE
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: LOCAL_NODE
-                optional: false
-          - name: SERVER_PORT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: SERVER_PORT
-                optional: false
-          - name: OPERATOR_ID_MAIN
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: OPERATOR_ID_MAIN
-                optional: false
-          - name: OPERATOR_KEY_MAIN
-            valueFrom:
-              secretKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: OPERATOR_KEY_MAIN
-                optional: false
-          - name: DEFAULT_RATE_LIMIT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: DEFAULT_RATE_LIMIT
-                optional: true
-          - name: TIER_1_RATE_LIMIT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: TIER_1_RATE_LIMIT
-                optional: true
-          - name: TIER_2_RATE_LIMIT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: TIER_2_RATE_LIMIT
-                optional: true
-          - name: TIER_3_RATE_LIMIT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: TIER_3_RATE_LIMIT
-                optional: true
-          - name: LIMIT_DURATION
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: LIMIT_DURATION
-                optional: true
-          - name: HBAR_RATE_LIMIT_TINYBAR
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: HBAR_RATE_LIMIT_TINYBAR
-                optional: true
-          - name: HBAR_RATE_LIMIT_DURATION
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: HBAR_RATE_LIMIT_DURATION
-                optional: true
-          - name: ETH_GET_LOGS_BLOCK_RANGE_LIMIT
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: ETH_GET_LOGS_BLOCK_RANGE_LIMIT
-                optional: true
-          - name: RATE_LIMIT_DISABLED
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: RATE_LIMIT_DISABLED
-                optional: true
-          - name: DEV_MODE
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: DEV_MODE
-                optional: true
-          - name: GAS_PRICE_TINY_BAR_BUFFER
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: GAS_PRICE_TINY_BAR_BUFFER
-          - name: MIRROR_NODE_RETRIES
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: MIRROR_NODE_RETRIES
-                optional: true
-          - name: MIRROR_NODE_RETRY_DELAY
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: MIRROR_NODE_RETRY_DELAY
-                optional: true
-          - name: MIRROR_NODE_LIMIT_PARAM
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: MIRROR_NODE_LIMIT_PARAM
-                optional: true
-          - name: CLIENT_TRANSPORT_SECURITY
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "json-rpc-relay.fullname" . }}
-                key: CLIENT_TRANSPORT_SECURITY
-                optional: true
+        envFrom:
+        - configMapRef:
+          name: {{ include "json-rpc-relay.fullname" . }}
+        - secretRef:
+          name: {{ include "json-rpc-relay.fullname" . }}  
         ports:
           - containerPort: {{ .Values.ports.containerPort }}
             name: {{ .Values.ports.name  }}

helm-chart/templates/secret.yaml

@@ -5,8 +5,8 @@ metadata:
   name: {{ include "json-rpc-relay.fullname" . }}
 type: Opaque
 stringData:
-  OPERATOR_ID_MAIN: {{ .Values.config.OPERATOR_ID_MAIN }}
-  OPERATOR_KEY_MAIN: {{ .Values.config.OPERATOR_KEY_MAIN }}
+  OPERATOR_ID_MAIN: {{ .Values.config.OPERATOR_ID_MAIN | quote }}
+  OPERATOR_KEY_MAIN: {{ .Values.config.OPERATOR_KEY_MAIN | quote }}
   OPERATOR_ID_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_ID_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}
   OPERATOR_KEY_ETH_SENDRAWTRANSACTION: {{ .Values.config.OPERATOR_KEY_ETH_SENDRAWTRANSACTION | default (printf "%q" "") }}  
 

helm-chart/templates/service.yaml

@@ -8,10 +8,6 @@ metadata:
   annotations:
 {{ toYaml .Values.service.annotations | nindent 4 }}
 {{- end }}
-{{- if .Values.service.annontations_JSON }}
-  annotations:
-{{ .Values.service.annontations_JSON | toJson | nindent 4 }}
-{{- end }}  
 spec:
   type: {{ .Values.service.type }}
   ports:

helm-chart/value-test.yaml

@@ -40,7 +40,6 @@ service:
   type: ClusterIP
   port: 7546
   annotations: {}
-  annotations_JSON: {}
 
 ingress:
   enabled: false

helm-chart/values.yaml

@@ -40,7 +40,6 @@ service:
   type: ClusterIP
   port: 7546
   annotations: {}
-  annotations_JSON: {}
 
 ingress:
   enabled: false