[incubator/vault] Fix serviceAccount reference and resource limits (#14895)

* add sa name to deployment

Signed-off-by: Janusz Bialy <jbialy@gmail.com>

* move vault container specific resources before any extra containers

Signed-off-by: Janusz Bialy <jbialy@gmail.com>

* bump chart version

Signed-off-by: Janusz Bialy <jbialy@gmail.com>

* bump version

Signed-off-by: Janusz Bialy <jbialy@gmail.com>

* update readme

Signed-off-by: Janusz Bialy <jbialy@gmail.com>
This commit is contained in:
Janusz Bialy
2019-06-27 20:31:21 -07:00
committed by Kubernetes Prow Robot
parent d98f440b68
commit 4f10582e69
3 changed files with 5 additions and 3 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.10
version: 0.18.11
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
@@ -79,6 +79,7 @@ The following table lists the configurable parameters of the Vault chart and the
| `minReadySeconds` | Minimum number of seconds that newly created replicas must be ready without any containers crashing | `0` |
| `podLabels` | Extra labels for pods | `{}` |
| `serviceAccount.create` | Specifies whether a ServiceAccount should be created | `false` |
| `serviceAccount.name` | The name of the ServiceAccount to create | Generated from fullname template |
| `consulAgent.join` | If set, start start a consul agent | `nil` |
| `consulAgent.repository` | Container image for consul agent | `consul` |
| `consulAgent.tag` | Container image tag for consul agent | `1.4.0` |
+3 -2
View File
@@ -98,6 +98,8 @@ spec:
{{- if .Values.vault.extraEnv }}
{{ toYaml .Values.vault.extraEnv | indent 10 }}
{{- end }}
resources:
{{ toYaml .Values.resources | indent 10 }}
volumeMounts:
- name: vault-config
mountPath: /vault/config/
@@ -109,8 +111,6 @@ spec:
{{- if .Values.vault.extraContainers }}
{{ tpl (toYaml .Values.vault.extraContainers) . | indent 6}}
{{- end }}
resources:
{{ toYaml .Values.resources | indent 10 }}
{{- if .Values.consulAgent.join }}
- name: {{ .Chart.Name }}-consul-agent
image: "{{ .Values.consulAgent.repository }}:{{ .Values.consulAgent.tag }}"
@@ -183,6 +183,7 @@ spec:
tolerations:
{{ toYaml .Values.tolerations | indent 8 }}
{{- end }}
serviceAccountName: {{ template "vault.serviceAccountName" . }}
volumes:
- name: vault-config
configMap: