From 05af1b178aa1a1d651b8a7ac38eb2c386949a61b Mon Sep 17 00:00:00 2001
From: Jonathan Bartlett <34320158+Jonnobrow@users.noreply.github.com>
Date: Fri, 11 Mar 2022 17:09:43 +0000
Subject: [PATCH] Fix image tag not followed in polylith (#1451)

---
 charts/incubator/dendrite/Chart.yaml            | 6 +++---
 charts/incubator/dendrite/templates/common.yaml | 2 +-
 charts/incubator/dendrite/values.yaml           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/incubator/dendrite/Chart.yaml b/charts/incubator/dendrite/Chart.yaml
index 052a2896..079f6b38 100644
--- a/charts/incubator/dendrite/Chart.yaml
+++ b/charts/incubator/dendrite/Chart.yaml
@@ -3,7 +3,7 @@ apiVersion: v2
 appVersion: v0.6.3
 description: Dendrite Matrix Homeserver
 name: dendrite
-version: 3.0.1
+version: 3.0.2
 kubeVersion: ">=1.16.0-0"
 keywords:
   - dendrite
@@ -87,5 +87,5 @@ dependencies:
     condition: dendrite.polylithEnabled
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Bumped app version to v0.6.3
+    - kind: fixed
+      description: Fixed image tag not being followed in polylith deployments
diff --git a/charts/incubator/dendrite/templates/common.yaml b/charts/incubator/dendrite/templates/common.yaml
index 083cfcac..7b0d982d 100644
--- a/charts/incubator/dendrite/templates/common.yaml
+++ b/charts/incubator/dendrite/templates/common.yaml
@@ -4,7 +4,7 @@
     {{- include "common.values.setup" (index $.Subcharts .) }}
     {{- with (index $.Values .) }}
       {{- with .image }}
-        {{- $_ := set . "tag" (default .tag $.Chart.AppVersion) -}}
+        {{- $_ := set . "tag" (default $.Chart.AppVersion .tag) -}}
       {{- end -}}
       {{- if not .persistence }}
         {{- $_ := set . "persistence" (dict)}}
diff --git a/charts/incubator/dendrite/values.yaml b/charts/incubator/dendrite/values.yaml
index f84232eb..07b145b3 100644
--- a/charts/incubator/dendrite/values.yaml
+++ b/charts/incubator/dendrite/values.yaml
@@ -229,7 +229,7 @@ syncapi:
     repository: matrixdotorg/dendrite-polylith
     # -- image tag
     # @default -- chart.appVersion
-    tag:
+    tag: latest
     # -- image pull policy
     pullPolicy: IfNotPresent
   service: