From c3032aa1f7a21865fca19550641d6ad283ac1dfc Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Fri, 14 Aug 2020 16:11:10 +0200
Subject: [PATCH] matrix-synapse: Shorter worker/replication names

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

diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml
index 76715db..543603c 100644
--- a/charts/matrix-synapse/Chart.yaml
+++ b/charts/matrix-synapse/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
 appVersion: 1.18.0
 
 type: application
-version: 1.0.2
+version: 1.1.0
 maintainers:
   - name: Alexander Olofsson
     email: ace@haxalot.com
diff --git a/charts/matrix-synapse/templates/_helpers.tpl b/charts/matrix-synapse/templates/_helpers.tpl
index 47c271c..27a0d02 100644
--- a/charts/matrix-synapse/templates/_helpers.tpl
+++ b/charts/matrix-synapse/templates/_helpers.tpl
@@ -29,7 +29,7 @@ Create a default replication name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "matrix-synapse.replicationname" -}}
-{{- printf "%s-%s-%s" .Release.Name .Chart.Name "replication" | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .Release.Name "replication" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -37,7 +37,7 @@ Create a default worker name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "matrix-synapse.workername" -}}
-{{- printf "%s-%s-%s" .global.Release.Name .global.Chart.Name .worker | trunc 63 | trimSuffix "-" -}}
+{{- printf "%s-%s" .global.Release.Name .worker | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*