Merge pull request #3897 from fabian-woelk-el/feature/collout-operator-env-vars

[rollout-operator] Add configuration options for env vars

Author: andyasp

charts/rollout-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.33.0
+version: 0.33.1
 appVersion: v0.29.0
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.33.0](https://img.shields.io/badge/Version-0.33.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
+![Version: 0.33.1](https://img.shields.io/badge/Version-0.33.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.29.0](https://img.shields.io/badge/AppVersion-v0.29.0-informational?style=flat-square)
 
 Grafana rollout-operator
 
@@ -49,6 +49,8 @@ Manually applying these CRDs is only required if upgrading from a chart <= v0.32
 |-----|------|---------|-------------|
 | affinity | object | `{}` |  |
 | extraArgs | list | `[]` | List of additional CLI arguments to configure rollout-operator (example: `--log.level=info`) |
+| extraEnv | list | `[]` | Environment variables to add to rollout-operator container |
+| extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to rollout-operator container |
 | fullnameOverride | string | `""` |  |
 | global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
 | hostAliases | list | `[]` | hostAliases to add |

charts/rollout-operator/templates/deployment.yaml

@@ -58,6 +58,18 @@ spec:
           {{- range .Values.extraArgs  }}
           - {{ . }}
           {{- end }}
+          {{- if .Values.extraEnv }}
+          env:
+            {{- with .Values.extraEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- end }}
+          {{- if .Values.extraEnvFrom }}
+          envFrom:
+            {{- with .Values.extraEnvFrom }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+          {{- end }}
           ports:
             - name: http-metrics
               containerPort: 8001
@@ -86,4 +98,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}

charts/rollout-operator/values.yaml

@@ -56,6 +56,12 @@ securityContext: {}
 # -- List of additional CLI arguments to configure rollout-operator (example: `--log.level=info`)
 extraArgs: []
 
+# -- Environment variables to add to rollout-operator container
+extraEnv: []
+
+# -- Environment variables from secrets or configmaps to add to rollout-operator container
+extraEnvFrom: []
+
 resources:
   limits:
     # cpu: "1"