From ec6b5099f23af9312fa0b3fced8242ef25924506 Mon Sep 17 00:00:00 2001
From: Sergei Antipov <greendayonfire@gmail.com>
Date: Sat, 25 Nov 2017 21:10:25 +0700
Subject: [PATCH] [stable/influxdb] Add default values for user creation Job
 (#2687)

---
 stable/influxdb/Chart.yaml                          |  2 +-
 .../influxdb/templates/post-install-set-auth.yaml   |  2 +-
 stable/influxdb/values.yaml                         | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stable/influxdb/Chart.yaml b/stable/influxdb/Chart.yaml
index 1cf2820cc5..e7affa1d23 100755
--- a/stable/influxdb/Chart.yaml
+++ b/stable/influxdb/Chart.yaml
@@ -1,5 +1,5 @@
 name: influxdb
-version: 0.6.0
+version: 0.6.1
 description: Scalable datastore for metrics, events, and real-time analytics.
 keywords:
 - influxdb
diff --git a/stable/influxdb/templates/post-install-set-auth.yaml b/stable/influxdb/templates/post-install-set-auth.yaml
index 353239a8bd..27abcbef04 100644
--- a/stable/influxdb/templates/post-install-set-auth.yaml
+++ b/stable/influxdb/templates/post-install-set-auth.yaml
@@ -11,7 +11,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install
 spec:
-  activeDeadlineSeconds: {{ default 300 .Values.setDefaultUser.activeDeadlineSeconds }}
+  activeDeadlineSeconds: {{ .Values.setDefaultUser.activeDeadlineSeconds }}
   template:
     metadata:
       labels:
diff --git a/stable/influxdb/values.yaml b/stable/influxdb/values.yaml
index 3f909eefa3..971d436b9f 100644
--- a/stable/influxdb/values.yaml
+++ b/stable/influxdb/values.yaml
@@ -42,22 +42,22 @@ setDefaultUser:
   ## Image of the container used for job
   ## Default: appropriate/curl:latest
   ##
-  # image: appropriate/curl:latest
+  image: appropriate/curl:latest
 
   ## Deadline for job so it does not retry forever.
   ## Default: activeDeadline: 300
   ##
-  # activeDeadline: 300
+  activeDeadline: 300
 
   ## Restart policy for job
   ## Default: OnFailure
-  # restartPolicy: OnFailure
+  restartPolicy: OnFailure
 
-  # user:
+  user:
 
     ## The user name
     ## Default: "admin"
-    # username: "admin"
+    username: "admin"
 
     ## User password
     ## Default: (Randomly generated 10 characters of Ascii)
@@ -65,7 +65,7 @@ setDefaultUser:
 
     ## User privileges
     ## Default: "WITH ALL PRIVILEGES"
-    # privileges: "WITH ALL PRIVILEGES"
+    privileges: "WITH ALL PRIVILEGES"
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
@@ -82,7 +82,6 @@ resources:
 ##
 nodeSelector: {}
 
-
 ## Change InfluxDB configuration paramaters below:
 ## Defaults are indicated
 ## ref: https://docs.influxdata.com/influxdb/v1.1/administration/config/