From dcbe829debedd5ae84f96c7f32f7d3156f9cda8f Mon Sep 17 00:00:00 2001
From: Dinesh Kumar <5300055+devdinu@users.noreply.github.com>
Date: Wed, 21 Aug 2019 23:44:32 +0530
Subject: [PATCH] Add vault api address for non dev setup (#15991)

Signed-off-by: Dinesh Kumar <dinesh.kumar@go-jek.com>
---
 incubator/vault/Chart.yaml                | 2 +-
 incubator/vault/templates/deployment.yaml | 4 ++++
 incubator/vault/values.yaml               | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/incubator/vault/Chart.yaml b/incubator/vault/Chart.yaml
index 4a7aa9191d..53bfa6fcb6 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.16
+version: 0.19.0
 appVersion: 1.1.2
 home: https://www.vaultproject.io/
 icon: https://www.vaultproject.io/assets/images/mega-nav/logo-vault-0f83e3d2.svg
diff --git a/incubator/vault/templates/deployment.yaml b/incubator/vault/templates/deployment.yaml
index c395bbfcf5..dcf5951ba5 100644
--- a/incubator/vault/templates/deployment.yaml
+++ b/incubator/vault/templates/deployment.yaml
@@ -132,8 +132,12 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
+          - name: VAULT_API_ADDR
+            value: "https://$(POD_IP):8200"
+        {{- if not .Values.vault.dev }}
           - name: VAULT_CLUSTER_ADDR
             value: "https://$(POD_IP):8201"
+        {{- end }}
           - name: VAULT_LOG_LEVEL
             value: {{ .Values.vault.logLevel | quote }}
         {{- if .Values.vault.extraEnv }}
diff --git a/incubator/vault/values.yaml b/incubator/vault/values.yaml
index 205ddd1c85..b137d3c647 100644
--- a/incubator/vault/values.yaml
+++ b/incubator/vault/values.yaml
@@ -231,8 +231,10 @@ vault:
       #   path: ""
       #
       # etcd:
-      #   address: ""
+      #   address: "http://vault-etcd:2379"
       #   path: "vault/"
+      #   etcd_api: "v3"
+      #   ha_enabled: "true"
       #
       # s3:
       #   bucket: ""