diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml index d5f17b656b..016cb857d5 100644 --- a/incubator/vault/Chart.yaml +++ b/incubator/vault/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Vault, a tool for managing secrets name: vault -version: 0.18.3 +version: 0.18.4 appVersion: 1.0.1 home: https://www.vaultproject.io/ icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg diff --git a/incubator/vault/README.md b/incubator/vault/README.md index 968b3faf08..dbb4e3dee9 100644 --- a/incubator/vault/README.md +++ b/incubator/vault/README.md @@ -75,6 +75,7 @@ The following table lists the configurable parameters of the Vault chart and the | `labels` | Extra labels for deployment | `{}` | | `ingress.labels` | Labels for ingress | `{}` | | `podAnnotations` | Annotations for pods | `{}` | +| `podLabels` | Extra labels for pods | `{}` | | `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` | | `consulAgent.join` | If set, start start a consul agent | `nil` | | `consulAgent.repository` | Container image for consul agent | `consul` | diff --git a/incubator/vault/templates/deployment.yaml b/incubator/vault/templates/deployment.yaml index 1bf62781bb..565e1730a3 100644 --- a/incubator/vault/templates/deployment.yaml +++ b/incubator/vault/templates/deployment.yaml @@ -23,6 +23,9 @@ spec: labels: app: {{ template "vault.name" . }} release: {{ .Release.Name }} +{{- if .Values.podLabels }} +{{ toYaml .Values.podLabels | indent 8 }} +{{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- range $key, $value := .Values.podAnnotations }} diff --git a/incubator/vault/values.yaml b/incubator/vault/values.yaml index 65e1c89f28..858be14985 100644 --- a/incubator/vault/values.yaml +++ b/incubator/vault/values.yaml @@ -117,7 +117,12 @@ annotations: {} ## Extra Deployment labels labels: {} +## Pod annotations podAnnotations: {} + +## Pod labels +podLabels: {} + ## Read more about kube2iam to provide access to s3 https://github.com/jtblin/kube2iam # iam.amazonaws.com/role: role-arn