allow admin user creation to be skipped

Setting 'create' to 'true' as it's generally wanted, but now the flag exists so it can be skipped. I tested this locally with both options to make sure it worked, and I copied the naming from influx1's chart, but feel free to make changes as necessary. While the PR has been open, the verion number got bumped forward, and I needed to bump it again to clear lint. So I rebased and force-pushed my branch to make it clear. - [ ] CHANGELOG.md updated - [ ] Rebased/mergable - [ ] Tests pass - [ ] Sign [CLA](https://influxdata.com/community/cla/) (if not already signed)

allow admin user creation to be skipped
2ee220c6 · ted · David McKay · d659011c · 2ee220c6 · 2ee220c6
Commit 2ee220c6 authored Dec 07, 2020 by ted Committed by David McKay Dec 14, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

Chart.yaml charts/influxdb2/Chart.yaml +1 -1

job-setup-admin.yaml charts/influxdb2/templates/job-setup-admin.yaml +2 -0

values.yaml charts/influxdb2/values.yaml +1 -0

No files found.
--- a/charts/influxdb2/Chart.yaml
+++ b/charts/influxdb2/Chart.yaml
@@ -5,7 +5,7 @@ name: influxdb2
 description: A Helm chart for InfluxDB v2
 home: https://www.influxdata.com/products/influxdb-overview/influxdb-2-0/
 type: application
-version: 1.0.12
+version: 1.0.13
 maintainers:
  - name: rawkode
    email: rawkode@influxdata.com

--- a/charts/influxdb2/templates/job-setup-admin.yaml
+++ b/charts/influxdb2/templates/job-setup-admin.yaml
+{{- if .Values.adminUser.create -}}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -41,3 +42,4 @@ spec:
            -p ${INFLUXDB_PASSWORD} \
            -t ${INFLUXDB_TOKEN}
      restartPolicy: OnFailure
+{{- end -}}
--- a/charts/influxdb2/values.yaml
+++ b/charts/influxdb2/values.yaml
@@ -29,6 +29,7 @@ securityContext: {}
 ## Defaults indicated below
 ##
 adminUser:
+  create: true
  organization: "influxdata"
  bucket: "default"
  user: "admin"