allow adding envs to k8s read (#47)

* allow adding envs to k8s read * [AUTO GITHUB] Bump chart versions * allow pass envs to static sbom * [AUTO GITHUB] Bump chart versions --------- Co-authored-by: dvdlevanon-miggo <[email protected]>
miggo-io · Nov 19, 2024 · a205625 · a205625
1 parent be170fd
commit a205625
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/charts/k8s-read/Chart.yaml b/charts/k8s-read/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: k8s-read
 description: A Helm chart for miggo's k8s-read
 type: application
-version: 0.0.4
+version: 0.0.5
 appVersion: "0.0.1"
diff --git a/charts/k8s-read/templates/deployment.yaml b/charts/k8s-read/templates/deployment.yaml
@@ -54,15 +54,21 @@ spec:
             - --metric-tls-skip-verify={{ default .Values.output.otlp.tlsSkipVerify $globalMetricTlsSkipVerify }}
             - --metric-interval={{ coalesce .Values.config.metrics.interval $globalMetricInterval }}
             - --interval={{ .Values.config.interval }}
-          {{- if .Values.output.otlp.existingSecret }}
           envFrom:
+          {{- if .Values.output.otlp.existingSecret }}
           - secretRef:
               name: {{ .Values.output.otlp.existingSecret }}
           {{- else }}
-          envFrom:
           - secretRef:
               name: k8s-read-otlp-secret
           {{- end }}
+          {{- with .Values.extraEnvsFrom }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          env:
+          {{- with .Values.extraEnvs }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
           - containerPort: {{ .Values.healthcheck.port }}
           livenessProbe:

diff --git a/charts/k8s-read/values.yaml b/charts/k8s-read/values.yaml
@@ -71,3 +71,5 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 
+extraEnvs: []
+extraEnvsFrom: []
diff --git a/charts/static-sbom/Chart.yaml b/charts/static-sbom/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: static-sbom
 description: A Helm chart for miggo's static-sbom
 type: application
-version: 0.0.7
+version: 0.0.8
 appVersion: "0.0.1"
diff --git a/charts/static-sbom/templates/deployment.yaml b/charts/static-sbom/templates/deployment.yaml
@@ -62,15 +62,21 @@ spec:
             - --cache-cm-name={{ include "static-sbom.configMapCacheName" . }}
             - --cache-cm-namespace={{ .Release.Namespace }}
             {{ end }}
-          {{- if .Values.output.otlp.existingSecret }}
           envFrom:
+          {{- if .Values.output.otlp.existingSecret }}
           - secretRef:
               name: {{ .Values.output.otlp.existingSecret }}
           {{- else }}
-          envFrom:
           - secretRef:
               name: static-sbom-otlp-secret
           {{- end }}
+          {{- with .Values.extraEnvsFrom }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          env:
+          {{- with .Values.extraEnvs }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           ports:
           - containerPort: {{ .Values.healthcheck.port }}
           livenessProbe:

diff --git a/charts/static-sbom/values.yaml b/charts/static-sbom/values.yaml
@@ -77,3 +77,5 @@ nodeSelector: {}
 tolerations: []
 affinity: {}
 
+extraEnvs: []
+extraEnvsFrom: []