From b7a8df280f5c11b05fbe803919a930cb841c9aee Mon Sep 17 00:00:00 2001
From: Sangho Na <sangho@nsh.nz>
Date: Thu, 16 May 2024 23:33:15 +1200
Subject: [PATCH] refactor: Force same image repository and tag for wagtail and
 crons (#445)

---
 helm/templates/cronjob.yaml | 4 ++--
 helm/values.yaml            | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/helm/templates/cronjob.yaml b/helm/templates/cronjob.yaml
index 9928ff71..f6fc1a2b 100644
--- a/helm/templates/cronjob.yaml
+++ b/helm/templates/cronjob.yaml
@@ -20,8 +20,8 @@ spec:
                 name: django-configmap
           containers:
           - name: {{ .name | quote }}
-            image: "{{ .image.repository }}:{{ default $.Chart.AppVersion .image.tag }}"
-            imagePullPolicy: {{ .image.pullPolicy }}
+            image: "{{ $.Values.wagtail.image.repository }}:{{ default $.Chart.AppVersion $.Values.wagtail.image.tag }}"
+            imagePullPolicy: {{ $.Values.wagtail.image.pullPolicy }}
             volumeMounts:
             - name: settings-local-volume
               mountPath: /app/ietf/settings/local.py
diff --git a/helm/values.yaml b/helm/values.yaml
index 0add2a9c..9213693b 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -208,18 +208,10 @@ cronjob:
     - name: mgmt-hourly
       schedule: "0 * * * *" # "At minute 0."
       timeZone: "Etc/UTC"
-      image:
-        repository: "ghcr.io/ietf-tools/www"
-        pullPolicy: IfNotPresent
-        # tag: "v2.1.10"
       command: ["python", "/app/manage.py", "publish_scheduled"]
     - name: mgmt-weekly
       schedule: "30 0 * * 0" # "At 00:30 on Sunday."
       timeZone: "Etc/UTC"
-      image:
-        repository: "ghcr.io/ietf-tools/www"
-        pullPolicy: IfNotPresent
-        # tag: "v2.1.10"
       command: ["python", "/app/manage.py", "update_index"]
 
 # -------------------------------------------------------------