[incubator/vault] Allow disabling of setting VAULT_API_ADDR (#18224)

* [incubator/vault] Allow disabling of setting `VAULT_API_ADDR` environment variables

Signed-off-by: Yong Wen Chua <lawliet89@users.noreply.github.com>

* Fix scheme for API address

Signed-off-by: Yong Wen Chua <lawliet89@users.noreply.github.com>

* Bump chart again

Signed-off-by: Yong Wen Chua <lawliet89@users.noreply.github.com>
This commit is contained in:
Yong Wen Chua
2019-10-23 18:35:06 -07:00
committed by Kubernetes Prow Robot
parent e47e5a268a
commit baa2f7f74f
4 changed files with 9 additions and 2 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.22.1
version: 0.22.2
appVersion: 1.2.3
home: https://www.vaultproject.io/
icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg
+1
View File
@@ -61,6 +61,7 @@ The following table lists the configurable parameters of the Vault chart and the
| `vault.extraVolumes` | Additional volumes to the controller pod | `{}` |
| `vault.extraVolumeMounts` | Extra volumes to mount to the controller pod | `{}` |
| `vault.existingConfigName` | Location of existing Vault configuration | nil |
| `vault.podApiAddress` | Set the `VAULT_API_ADDR` environment variable to the Pod IP Address. This is the address (full URL) to advertise to other Vault servers in the cluster for client redirection.| `true` |
| `vault.config` | Vault configuration | No default backend |
| `replicaCount` | k8s replicas | `3` |
| `resources.limits.cpu` | Container requested CPU | `nil` |
+3 -1
View File
@@ -139,8 +139,10 @@ spec:
valueFrom:
fieldRef:
fieldPath: status.podIP
{{- if .Values.vault.podApiAddress }}
- name: VAULT_API_ADDR
value: "http://$(POD_IP):8200"
value: "{{ if .Values.vault.config.listener.tcp.tls_disable }}http{{ else }}https{{ end }}://$(POD_IP):8200"
{{- end }}
{{- if not .Values.vault.dev }}
- name: VAULT_CLUSTER_ADDR
value: "https://$(POD_IP):8201"
+4
View File
@@ -241,6 +241,10 @@ vault:
readyIfUninitialized: true
initialDelaySeconds: 10
periodSeconds: 10
# Set the `VAULT_API_ADDR` environment variable to the Pod IP Address
# This is the address (full URL) to advertise to other Vault servers in the cluster for client redirection.
# See https://www.vaultproject.io/docs/configuration/#api_addr
podApiAddress: true
## Use an existing config in a named ConfigMap
# existingConfigName: vault-cm
config: