misc

Flagsmith · Jul 8, 2024 · 1f8d1f5 · 1f8d1f5
1 parent a87862a
commit 1f8d1f5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
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.50.0
+version: 0.51.0
 appVersion: 2.126.0
 dependencies:
   - name: postgresql

diff --git a/charts/flagsmith/templates/NOTES.txt b/charts/flagsmith/templates/NOTES.txt
@@ -54,9 +54,8 @@ See https://docs.flagsmith.com/deployment/locally-api#creating-a-secret-key
 ######################################
 
 InfluxDB2 is deprecated and will be removed in the next major version.
-You can either use InfluxDBExternal or migrate your analytics data to PostgreSQL by using the migrateAnalyticsData job
-and enable PostgreSQL analytics by setting `UsePostgresForAnalytics.enabled` to true.
-
+Please set values under the `influxdbExternal` key
+or migrate your analytics data to PostgreSQL by enabling `jobs.migrateAnalytics`.
 {{- end }}
 
 --------------------------------------
diff --git a/charts/flagsmith/templates/_api_environment.yaml b/charts/flagsmith/templates/_api_environment.yaml
@@ -54,7 +54,7 @@
       {{- end }}
 {{- else if .Values.UsePostgresForAnalytics.enabled }}
 {{- if not .Values.taskProcessor.enabled }}
-{{ fail "To use Postgre for analytics, the task processor must be enabled" }}
+{{ fail "To use PostgreSQL for analytics, `taskProcessor.enabled` should be set to `true`" }}
 {{- end}}
 - name: USE_POSTGRES_FOR_ANALYTICS
   value: 'true'

diff --git a/charts/flagsmith/templates/jobs-migrate-analytics-data.yaml b/charts/flagsmith/templates/jobs-migrate-analytics-data.yaml
@@ -15,6 +15,12 @@ spec:
   template:
     spec:
       restartPolicy: Never
+      {{- if .Values.jobs.migrateDb.serviceAccountName }}
+      serviceAccountName: {{ .Values.jobs.migrateDb.serviceAccountName }}
+      {{- end }}
+      {{- if .Values.jobs.migrateDb.shareProcessNamespace }}
+      {{- end }}
+      shareProcessNamespace: true
       containers:
       - name: migrate-analytics-data
         image: {{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default (printf "%s" .Chart.AppVersion) }}
@@ -23,5 +29,11 @@ spec:
         args: {{ toYaml .Values.jobs.migrateAnalyticsData.args | nindent 8 }}
         {{- end }}
         env: {{ include (print $.Template.BasePath "/_api_environment.yaml") . | nindent 8 }}
-
+{{- with .Values.jobs.migrateDb.extraContainers }}
+{{- toYaml . | nindent 6 }}
+{{- end }}
+      volumes:
+{{- with .Values.jobs.migrateDb.extraVolumes }}
+{{- toYaml . | nindent 6 }}
+{{- end }}
 {{- end -}}
diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml
@@ -355,6 +355,8 @@ jobs:
   migrateAnalyticsData:
     enabled: false
     args: []
+    extraContainers: []
+    extraVolumes: []
 
 # These tests just make non-destructive requests to the services in
 # the cluster. Enabling this and running helm test is safe.