chore(node): add env and envFrom fields

RSS3-Network · Sep 9, 2024 · 16e447a · 16e447a
1 parent e7c5695
commit 16e447a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 1 deletion.
diff --git a/charts/node/Chart.yaml b/charts/node/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.4
+version: 0.5.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/node/templates/agent/deployment.yaml b/charts/node/templates/agent/deployment.yaml
@@ -51,6 +51,14 @@ spec:
           {{- with .Values.agent.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with concat .Values.global.env .Values.agent.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with concat .Values.global.envFrom .Values.agent.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config
           configMap:

diff --git a/charts/node/templates/broadcaster/deployment.yaml b/charts/node/templates/broadcaster/deployment.yaml
@@ -52,6 +52,14 @@ spec:
           {{- with .Values.broadcaster.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with concat .Values.global.env .Values.broadcaster.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with concat .Values.global.envFrom .Values.broadcaster.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config
           configMap:

diff --git a/charts/node/templates/core/deployment.yaml b/charts/node/templates/core/deployment.yaml
@@ -69,6 +69,14 @@ spec:
           {{- with .Values.core.volumeMounts }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
+          {{- with concat .Values.global.env .Values.core.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with concat .Values.global.envFrom .Values.core.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config
           configMap:

diff --git a/charts/node/templates/worker/deployment.yaml b/charts/node/templates/worker/deployment.yaml
@@ -71,6 +71,14 @@ spec:
           {{- end }}
           resources:
             {{- toYaml ($worker.resources | default $.Values.global.workerResources ) | nindent 12 }}
+          {{- with .Values.global.env }}
+          env:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.broadcaster.envFrom }}
+          envFrom:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
       volumes:
         - name: config
           configMap:

diff --git a/charts/node/values.yaml b/charts/node/values.yaml
@@ -97,6 +97,12 @@ global:
       cpu: 50m
       memory: 64Mi
 
+  # -- Default [env] variables for all components
+  env: []
+
+  # -- Default [envFrom] variables for all components
+  envFrom: []
+
 nameOverride: ""
 fullnameOverride: ""
 
@@ -117,6 +123,9 @@ core:
 
   imagePullSecrets: [ ]
 
+  env: [ ]
+  envFrom: [ ]
+
   # -- Annotations to be added to server Deployment
   deploymentAnnotations: { }
 
@@ -222,6 +231,9 @@ broadcaster:
 
   imagePullSecrets: [ ]
 
+  env: [ ]
+  envFrom: [ ]
+
   # -- Annotations to be added to server Deployment
   deploymentAnnotations: { }
 
@@ -286,6 +298,9 @@ agent:
 
   imagePullSecrets: [ ]
 
+  env: [ ]
+  envFrom: [ ]
+
   # -- Annotations to be added to server Deployment
   deploymentAnnotations: { }