Allow extra envs to be set for the AWS Signing sidecar (#78)

* Allow extra envs to be set for the AWS Signing sidecar Signed-off-by: Diego OJ <[email protected]> * Bump minor version instead of patch version Signed-off-by: Diego OJ <[email protected]>
kokuwaio · May 11, 2021 · 267722e · 267722e
1 parent 0d23316
commit 267722e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
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.11.0
+version: 11.12.0
 appVersion: 3.2.0
 type: application
 home: https://www.fluentd.org/

diff --git a/charts/fluentd-elasticsearch/README.md b/charts/fluentd-elasticsearch/README.md
@@ -64,6 +64,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `configMaps.useDefaults.outputConf` | Use default output.conf | `true` |
 | `extraConfigMaps` | Add additional Configmap or overwrite disabled default | `{}` |
 | `awsSigningSidecar.enabled` | Enable AWS request signing sidecar | `false` |
+| `awsSigningSidecar.extraEnvs` | List of env vars that are added to the AWS signing sidecar pods | `[]` |
 | `awsSigningSidecar.resources` | AWS Sidecar resources | `{}` |
 | `awsSigningSidecar.network.port` | AWS Sidecar exposure port | `8080` |
 | `awsSigningSidecar.network.address` | AWS Sidecar listen address | `localhost` |

diff --git a/charts/fluentd-elasticsearch/templates/daemonset.yaml b/charts/fluentd-elasticsearch/templates/daemonset.yaml
@@ -227,6 +227,12 @@ spec:
  env:
  - name: PORT_NUM
  value: {{ .Values.awsSigningSidecar.network.port | quote }}
+ {{- if .Values.awsSigningSidecar.extraEnvs }}
+ {{- range $env := .Values.awsSigningSidecar.extraEnvs }}
+ - name: {{ $env.name }}
+ value: {{ $env.value | quote }}
+ {{- end }}
+ {{- end }}
  resources:
 {{ toYaml .Values.awsSigningSidecar.resources | indent 10 }}
  volumeMounts:

diff --git a/charts/fluentd-elasticsearch/values.yaml b/charts/fluentd-elasticsearch/values.yaml
@@ -17,6 +17,12 @@ image:
 ## proxy that takes care of signing all requests being sent to the AWS ES Domain.
 awsSigningSidecar:
  enabled: false
+ # You can configure some features of AWS ES Proxy by passing specific environment
+ # variables. E.g. AWS EKS IRSA is supported by providing AWS_ROLE_ARN and
+ # AWS_WEB_IDENTITY_TOKEN_FILE
+ extraEnvs: []
+ # name: FOO
+ # value: BAR
  resources: {}
  # limits:
  # cpu: 100m