From e135c03e295b2efe67e9d5eeb6404f3d509a7a59 Mon Sep 17 00:00:00 2001 From: Ben Drucker Date: Tue, 22 Jan 2019 14:12:10 -0800 Subject: [PATCH] sumologic: add "extraEnv" for specifying custom env vars (#10837) Signed-off-by: Ben Drucker --- stable/sumologic-fluentd/Chart.yaml | 2 +- stable/sumologic-fluentd/README.md | 1 + stable/sumologic-fluentd/templates/daemonset.yaml | 3 +++ stable/sumologic-fluentd/values.yaml | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml index eb4e9e46ee..ea60d68037 100755 --- a/stable/sumologic-fluentd/Chart.yaml +++ b/stable/sumologic-fluentd/Chart.yaml @@ -1,5 +1,5 @@ name: sumologic-fluentd -version: 0.10.1 +version: 0.11.0 appVersion: 2.1.0 description: Sumologic Log Collector keywords: diff --git a/stable/sumologic-fluentd/README.md b/stable/sumologic-fluentd/README.md index a183a6c200..4ec5568a97 100644 --- a/stable/sumologic-fluentd/README.md +++ b/stable/sumologic-fluentd/README.md @@ -61,6 +61,7 @@ The following table lists the configurable parameters of the sumologic-fluentd c |-----------|-------------|---------| | `podAnnotations` | Annotations to add to the DaemonSet's Pods | `{}` | | `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | +| `extraEnv` | List of additional env vars to append to pods | `[]` | | `updateStrategy` | `OnDelete` or `RollingUpdate` (requires Kubernetes >= 1.6) | `OnDelete` | | `sumologic.collectorUrl` | An HTTP collector in SumoLogic that the container can send logs to via HTTP | `Nil` You must provide your own value | | `sumologic.collectorUrlExistingSecret` | If set, use the secret with the name provided instead of creating a new one | `Nil` You must reference an existing secret | diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml index b7d99e5646..0ef934f867 100644 --- a/stable/sumologic-fluentd/templates/daemonset.yaml +++ b/stable/sumologic-fluentd/templates/daemonset.yaml @@ -198,6 +198,9 @@ spec: - name: ENABLE_STAT_WATCHER value: {{ quote .Values.sumologic.enableStatWatcher }} {{- end }} +{{- if .Values.extraEnv }} +{{ toYaml .Values.extraEnv | indent 12 }} +{{- end }} serviceAccountName: {{ if .Values.rbac.create }}{{ template "sumologic-fluentd.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }} volumes: - name: pos-files diff --git a/stable/sumologic-fluentd/values.yaml b/stable/sumologic-fluentd/values.yaml index d4a7ff83b7..28e583d933 100644 --- a/stable/sumologic-fluentd/values.yaml +++ b/stable/sumologic-fluentd/values.yaml @@ -14,6 +14,9 @@ tolerations: [] # effect: NoSchedule # operator: "Exists" +# Extra environment variables to set for fluentd +extraEnv: [] + ## Allow the DaemonSet to perform a rolling update on helm update ## ref: https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/ updateStrategy: OnDelete