From 78eb71eb37778ffe10748187a8a6592268006f02 Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Tue, 3 Oct 2023 21:19:35 -0400
Subject: [PATCH 1/2] Use upstream flower docker image

---
 templates/flower/deployment.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/flower/deployment.yaml b/templates/flower/deployment.yaml
index 8af53e3..ff2f0f5 100644
--- a/templates/flower/deployment.yaml
+++ b/templates/flower/deployment.yaml
@@ -17,7 +17,6 @@ spec:
       annotations:
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-        tag: "{{ .Values.image.tag }}"
         {{- if .Values.flower.podAnnotations }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.flower.podAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
@@ -25,7 +24,7 @@ spec:
         {{- include "django.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: flower
     spec:
-    {{- with .Values.imagePullSecrets }}
+    {{- with .Values.flower.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
     {{- end }}
@@ -38,8 +37,8 @@ spec:
           {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.flower.image.repository }}:{{ .Values.flower.image.tag }}"
+          imagePullPolicy: {{ .Values.flower.image.pullPolicy }}
           ports:
           - containerPort: 5555
             name: http

From 0198481d9451e0dda4df655e574ac3068ac4be77 Mon Sep 17 00:00:00 2001
From: David Burke <david@burkesoftware.com>
Date: Wed, 4 Oct 2023 09:24:09 -0400
Subject: [PATCH 2/2] Use default values for flower image

---
 values.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/values.yaml b/values.yaml
index 1e28c58..4b64733 100644
--- a/values.yaml
+++ b/values.yaml
@@ -134,6 +134,10 @@ beat:
 
 flower:
   enabled: false
+  image:
+    repository: mher/flower
+    tag: latest
+    pullPolicy: IfNotPresent
   resources:
     limits:
       cpu: 500m