Merge pull request #145 from rufusnufus/main

fix: allow using influxDB credentials from existing secret
Flagsmith · Aug 31, 2023 · 73c148f · 73c148f
2 parents 1dad947 + f42017e
commit 73c148f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/charts/flagsmith/Chart.yaml b/charts/flagsmith/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: flagsmith
 description: Flagsmith
 type: application
-version: 0.22.0
+version: 0.22.1
 appVersion: 2.57.0
 dependencies:
   - name: postgresql

diff --git a/charts/flagsmith/templates/_api_environment.yaml b/charts/flagsmith/templates/_api_environment.yaml
@@ -28,8 +28,13 @@
 - name: INFLUXDB_TOKEN
   valueFrom:
     secretKeyRef:
+      {{- if .Values.influxdb2.adminUser.existingSecret }}
+      name: {{ .Values.influxdb2.adminUser.existingSecret }}
+      key: admin-token
+      {{- else }}
       name: {{ template "flagsmith.influxdb.fullname" . }}-auth
       key: admin-token
+      {{- end }}
 {{- else if .Values.influxdbExternal.enabled }}
 - name: INFLUXDB_URL
   value: {{ .Values.influxdbExternal.url | required "Must specify a URL for an external InfluxDB" }}

diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml
@@ -246,6 +246,10 @@ influxdb2:
     ## Or fill any of these values to use fixed values.
     password: ''
     token: ''
+    ## The password and token are obtained from an existing secret. The expected
+    ## keys are `admin-password` and `admin-token`.
+    ## If set, the password and token values above are ignored.
+    existingSecret: null
   persistence:
     enabled: false
     # storageClass: "-"