[stable/kube2iam] Support extra container environment variables (#5091)

* Support extra container environment variables.

* [stable/kube2iam] Ensure extra container environment variable values are quoted.

charts/kube2iam/Chart.yaml

@@ -1,5 +1,5 @@
 name: kube2iam
-version: 0.8.6
+version: 0.8.7
 appVersion: 0.10.0
 description: Provide IAM credentials to pods based on annotations.
 keywords:

charts/kube2iam/README.md

@@ -43,6 +43,7 @@ Parameter | Description | Default
 --- | --- | ---
 `affinity` | affinity configuration for pod assignment | `{}`
 `extraArgs` | Additional container arguments | `{}`
+`extraEnv` | Additional container environment variables | `{}`
 `host.ip` | IP address of host | `$(HOST_IP)`
 `host.iptables` | Add iptables rule | `false`
 `host.interface` | Host interface for proxying AWS metadata | `docker0`
@@ -56,7 +57,7 @@ Parameter | Description | Default
 `resources` | pod resource requests & limits | `{}`
 `updateStrategy` | Strategy for DaemonSet updates (requires Kubernetes 1.6+) | `OnDelete`
 `verbose` | Enable verbose output | `false`
-`tolerations` | List of node taints to tolerate (requires Kubernetes 1.6+) | `[]`          
+`tolerations` | List of node taints to tolerate (requires Kubernetes 1.6+) | `[]`
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

charts/kube2iam/templates/daemonset.yaml

@@ -63,6 +63,10 @@ spec:
             - name: AWS_DEFAULT_REGION
               value: {{ .Values.aws.region }}
           {{- end }}
+          {{- range $name, $value := .Values.extraEnv }}
+            - name: {{ $name }}
+              value: {{ quote $value }}
+          {{- end }}
           ports:
             - containerPort: {{ .Values.host.port }}
         {{- if .Values.probe }}

charts/kube2iam/values.yaml

@@ -4,6 +4,10 @@ extraArgs: {}
 #   api-server: ...
 #   api-token: ...
 
+extraEnv: {}
+#    http_proxy: http://example.com:8080
+#    NO_PROXY: localhost,127.0.0.1
+
 host:
   ip: $(HOST_IP)
   iptables: false