support annotations for Vault service account (#15950)

Signed-off-by: Brian Surber <bsurber120@yahoo.com>
This commit is contained in:
rosteroster
2019-07-29 10:33:56 -07:00
committed by Kubernetes Prow Robot
parent ad185e5b8f
commit 0648bac82c
4 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: A Helm chart for Vault, a tool for managing secrets
name: vault
version: 0.18.14
version: 0.18.15
appVersion: 1.1.2
home: https://www.vaultproject.io/
icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg
+1
View File
@@ -81,6 +81,7 @@ The following table lists the configurable parameters of the Vault chart and the
| `podLabels` | Extra labels for pods | `{}` |
| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
| `serviceAccount.name` | The name of the ServiceAccount to create | Generated from fullname template |
| `serviceAccount.annotations` | Annotations for the created ServiceAccount | `{}` |
| `rbac.create` | Specifies whether RBAC should be created | `true` |
| `consulAgent.join` | If set, start start a consul agent | `nil` |
| `consulAgent.repository` | Container image for consul agent | `consul` |
@@ -8,4 +8,8 @@ metadata:
chart: "{{ template "vault.chart" . }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
{{- if .Values.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
{{- end }}
{{- end -}}
+4
View File
@@ -145,6 +145,10 @@ serviceAccount:
## Specifies whether a ServiceAccount should be created
##
create: true
## Annotations to set for the ServiceAccount
# annotations:
# my-annotation: my-annotation-value
annotations: {}
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fullname template
name: