From c302e50a1bfc33ff6bf0a666bb07c530ad9119a0 Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <ace@haxalot.com>
Date: Sat, 20 Mar 2021 20:48:26 +0100
Subject: [PATCH] matrix-synapse: Switch to upstream image

---
 charts/matrix-synapse/templates/_helpers.tpl           | 2 +-
 charts/matrix-synapse/templates/worker-deployment.yaml | 2 +-
 charts/matrix-synapse/values.yaml                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charts/matrix-synapse/templates/_helpers.tpl b/charts/matrix-synapse/templates/_helpers.tpl
index 27a0d02..06425a9 100644
--- a/charts/matrix-synapse/templates/_helpers.tpl
+++ b/charts/matrix-synapse/templates/_helpers.tpl
@@ -59,7 +59,7 @@ Create chart name and version as used by the chart label.
 Get the correct image tag name
 */}}
 {{- define "matrix-synapse.imageTag" -}}
-{{- .Values.image.tag | default (printf "%s" .Chart.AppVersion) -}}
+{{- .Values.image.tag | default (printf "v%s" .Chart.AppVersion) -}}
 {{- end -}}
 
 {{/*
diff --git a/charts/matrix-synapse/templates/worker-deployment.yaml b/charts/matrix-synapse/templates/worker-deployment.yaml
index 3ab6385..74f7082 100644
--- a/charts/matrix-synapse/templates/worker-deployment.yaml
+++ b/charts/matrix-synapse/templates/worker-deployment.yaml
@@ -87,7 +87,7 @@ spec:
           {{- end }}
           securityContext:
             {{- $config.securityContext | default $default.securityContext | toYaml | nindent 12 }}
-          image: "{{ $.Values.image.repository }}:{{ $.Chart.AppVersion }}"
+          image: "{{ $.Values.image.repository }}:{{ include "matrix-synapse.imageTag" $ }}"
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           ports:
             - name: metrics
diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml
index 6fc386a..c57eb0d 100644
--- a/charts/matrix-synapse/values.yaml
+++ b/charts/matrix-synapse/values.yaml
@@ -2,7 +2,7 @@
 ## Docker image configuration, used for Synapse and workers.
 ##
 image:
-  repository: ananace/matrix-synapse
+  repository: matrixdotorg/synapse
   ## Tag to override with, will default to the application version.
   ##
   # tag: ''