Skip to content

Commit

Permalink
sumologic: add "extraEnv" for specifying custom env vars (helm#10837)
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Drucker <[email protected]>
  • Loading branch information
bendrucker authored and k8s-ci-robot committed Jan 22, 2019
1 parent d9ce11e commit e135c03
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion stable/sumologic-fluentd/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: sumologic-fluentd
version: 0.10.1
version: 0.11.0
appVersion: 2.1.0
description: Sumologic Log Collector
keywords:
Expand Down
1 change: 1 addition & 0 deletions stable/sumologic-fluentd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
3 changes: 3 additions & 0 deletions stable/sumologic-fluentd/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions stable/sumologic-fluentd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e135c03

Please sign in to comment.