Fix OUTPUT_(USER|PASSWORD) secrets usage (#49)

Previously if the user specified a secret with name `OUTPUT_USER` or `OUTPUT_PASSWORD` in `secrets` this lead to name clashes. Signed-off-by: Moritz Reinhardt <[email protected]>
kokuwaio · Dec 17, 2020 · 496788f · 496788f
1 parent 5cc6f35
commit 496788f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/charts/fluentd-elasticsearch/Chart.yaml b/charts/fluentd-elasticsearch/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: fluentd-elasticsearch
-version: 11.6.1
+version: 11.6.2
 appVersion: 3.1.0
 type: application
 home: https://www.fluentd.org/

diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md
@@ -71,8 +71,8 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `awsSigningSidecar.image.repository` | AWS signing sidecar repository image | `abutaha/aws-es-proxy` |
 | `awsSigningSidecar.image.tag` | AWS signing sidecar repository tag | `v1.0` |
 | `elasticsearch.auth.enabled` | Elasticsearch Auth enabled | `false` |
-| `elasticsearch.auth.user` | Elasticsearch Auth User | `""`  |
-| `elasticsearch.auth.password` | Elasticsearch Auth Password | `""`  |
+| `elasticsearch.auth.user` | Elasticsearch Auth User | `null` |
+| `elasticsearch.auth.password` | Elasticsearch Auth Password | `null` |
 | `elasticsearch.setOutputHostEnvVar` | Use `elasticsearch.hosts` (Disable this to manually configure hosts) | `true` |
 | `elasticsearch.hosts` | Elasticsearch Hosts List (host and port) | `["elasticsearch-client:9200"]` |
 | `elasticsearch.includeTagKey` | Elasticsearch Including of Tag key | `true` |

diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml
@@ -53,8 +53,10 @@ spec:
  - name: OUTPUT_PATH
  value: {{ .Values.elasticsearch.path | quote }}
 {{- if .Values.elasticsearch.auth.enabled }}
+{{- if .Values.elasticsearch.auth.user }}
  - name: OUTPUT_USER
  value: {{ .Values.elasticsearch.auth.user | quote }}
+{{- end }}
 {{- if .Values.elasticsearch.auth.password }}
  - name: OUTPUT_PASSWORD
  value: {{ .Values.elasticsearch.auth.password | quote }}

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -60,8 +60,8 @@ resources: {}
 elasticsearch:
  auth:
  enabled: false
- user: "yourUser"
- password: "yourPass"
+ user: null
+ password: null
  includeTagKey: true
  setOutputHostEnvVar: true
  # If setOutputHostEnvVar is false this value is ignored