Merge pull request #131 from Flagsmith/release/0.17.0

Release 0.17.0
Flagsmith · Apr 4, 2023 · fac7085 · fac7085
2 parents 950c2b3 + d6b83ad
commit fac7085
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 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.16.2
+version: 0.17.0
 appVersion: 2.42.1
 dependencies:
   - name: postgresql

diff --git a/charts/flagsmith/templates/deployment-task-processor.yaml b/charts/flagsmith/templates/deployment-task-processor.yaml
@@ -44,7 +44,10 @@ spec:
       {{- if .Values.taskProcessor.schedulerName }}
       schedulerName: "{{ .Values.taskProcessor.schedulerName }}"
       {{- end }}
-      {{- if .Values.api.image.imagePullSecrets }}
+      {{- if .Values.taskProcessor.image.imagePullSecrets }}
+      imagePullSecrets:
+{{ toYaml .Values.taskProcessor.image.imagePullSecrets | indent 8 }}
+      {{- else if .Values.api.image.imagePullSecrets }}
       imagePullSecrets:
 {{ toYaml .Values.api.image.imagePullSecrets | indent 8 }}
       {{- end }}
@@ -56,8 +59,8 @@ spec:
         {{- toYaml $securityContext | nindent 8 }}
       containers:
       - name: {{ .Chart.Name }}-task-processor
-        image: {{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default (printf "%s" .Chart.AppVersion) }}
-        imagePullPolicy: {{ .Values.api.image.imagePullPolicy }}
+        image: {{ .Values.taskProcessor.image.repository | default .Values.api.image.repository }}:{{ .Values.taskProcessor.image.tag | default .Values.api.image.tag | default .Chart.AppVersion }}
+        imagePullPolicy: {{ .Values.taskProcessor.image.imagePullPolicy | default .Values.api.image.imagePullPolicy }}
         command:
           - python
           - manage.py
@@ -74,6 +77,10 @@ spec:
 {{- with .Values.taskProcessor.gracePeriodMs }}
           - --graceperiodms
           - {{ . | quote }}
+{{- end }}
+{{- with .Values.taskProcessor.queuePopSize }}
+          - --queuepopsize
+          - {{ . | quote }}
 {{- end }}
         env: {{ include (print $.Template.BasePath "/_api_environment.yaml") . | nindent 8 }}
         livenessProbe:

diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml
@@ -118,11 +118,21 @@ frontend:
 
 # See https://docs.flagsmith.com/deployment/task-processor
 taskProcessor:
+  image:
+    # all values here default to those in .Values.api.image if not configured
+    # this is to simplify the logic for those using flagsmith-api image
+    # and to maintain backwards compatibility.
+    repository: null
+    tag: null
+    imagePullPolicy: null
+    imagePullSecrets: null
+
   enabled: false
   replicacount: 1
   sleepIntervalMs: null
   numThreads: null
   gracePeriodMs: null
+  queuePopSize: null
 
   livenessProbe:
     failureThreshold: 5