[stable/cluster-autoscaler] Allow individual envs from secrets (#16901)

This commit adds the `extraEnvSecrets` config to be a map in the format:
```
envFromSecret:
  <env var name>:
    name: <secret name>
    key: <secret key>
```
This adds more flexibility by allowing to expose selected keys from a
secret and also allowing for a different name for the env variable.

The new behavior is identical to the existing `envFromConfigMap` config.

Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
This commit is contained in:
Cezar Sá Espinola
2019-09-25 09:16:02 -07:00
committed by Kubernetes Prow Robot
parent a54960a0e4
commit c266df487e
3 changed files with 11 additions and 3 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ apiVersion: v1
description: Scales worker nodes within autoscaling groups.
icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
name: cluster-autoscaler
version: 4.0.1
version: 4.1.0
appVersion: 1.13.7
home: https://github.com/kubernetes/autoscaler
sources:
+3 -2
View File
@@ -148,8 +148,9 @@ Parameter | Description | Default
`extraArgs` | additional container arguments | `{}`
`podDisruptionBudget` | Pod disruption budget | `maxUnavailable: 1`
`extraEnv` | additional container environment variables | `{}`
`envFromConfigMap` | additional container environment variables from a configmap | `[]`
`envFromSecret` | additional container environment variables from secret | `nil`
`envFromConfigMap` | additional container environment variables from a configmap | `{}`
`envFromSecret` | secret name containing keys that will be exposed as envs | `nil`
`extraEnvSecrets` | additional container environment variables from a secret | `{}`
`nodeSelector` | node labels for pod assignment | `{}`
`podAnnotations` | annotations to add to each pod | `{}`
`deployment.apiVersion` | apiVersion for the deployment | `extensions/v1beta1`
@@ -149,6 +149,13 @@ spec:
name: {{ default (include "cluster-autoscaler.fullname" $) $value.name }}
key: {{ required "Must specify key!" $value.key }}
{{- end }}
{{- range $key, $value := .Values.extraEnvSecrets }}
- name: {{ $key }}
valueFrom:
secretKeyRef:
name: {{ default (include "cluster-autoscaler.fullname" $) $value.name }}
key: {{ required "Must specify key!" $value.key }}
{{- end }}
{{- if .Values.envFromSecret }}
envFrom:
- secretRef: