From 67f5c5bc1e837bbdee14d7d3388984ed8960528a Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Wed, 18 Jan 2023 08:45:34 +0100
Subject: [PATCH] =?UTF-8?q?fix(helm):=20extract=20image=20tag=20to=20value?=
 =?UTF-8?q?=20(and=20use=20as=20default=20from=20Chart.=E2=80=A6=20(#2934)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

improve image tag handling on the default helm way.
with usage of appVersion from:

https://github.com/matrix-org/dendrite/blob/0995dc48224b90432e38fa92345cf5735bca6090/helm/dendrite/Chart.yaml#L4

maybe you like to review @S7evinK ?

### Pull Request Checklist

<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->

* [x] I have added Go unit tests or [Complement integration
tests](https://github.com/matrix-org/complement) for this PR _or_ I have
justified why this PR doesn't need tests
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately

Signed-off-by: `Geno <geno+dev@fireorbit.de>`
---
 helm/dendrite/Chart.yaml                | 4 ++--
 helm/dendrite/templates/_helpers.tpl    | 4 +++-
 helm/dendrite/templates/deployment.yaml | 4 ++--
 helm/dendrite/templates/jobs.yaml       | 3 ++-
 helm/dendrite/templates/service.yaml    | 2 +-
 helm/dendrite/values.yaml               | 6 ++++--
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/helm/dendrite/Chart.yaml b/helm/dendrite/Chart.yaml
index 15d1e6d1..6e6641c8 100644
--- a/helm/dendrite/Chart.yaml
+++ b/helm/dendrite/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: dendrite
-version: "0.10.8"
-appVersion: "0.10.8"
+version: "0.10.9"
+appVersion: "0.10.9"
 description: Dendrite Matrix Homeserver
 type: application
 keywords:
diff --git a/helm/dendrite/templates/_helpers.tpl b/helm/dendrite/templates/_helpers.tpl
index 291f351b..02670658 100644
--- a/helm/dendrite/templates/_helpers.tpl
+++ b/helm/dendrite/templates/_helpers.tpl
@@ -15,9 +15,11 @@
 
 
 {{- define "image.name" -}}
-image: {{ .name }}
+{{- with .Values.image -}}
+image: {{ .repository }}:{{ .tag | default (printf "v%s" $.Chart.AppVersion) }}
 imagePullPolicy: {{ .pullPolicy }}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Expand the name of the chart.
diff --git a/helm/dendrite/templates/deployment.yaml b/helm/dendrite/templates/deployment.yaml
index 629ffe52..b463c7d0 100644
--- a/helm/dendrite/templates/deployment.yaml
+++ b/helm/dendrite/templates/deployment.yaml
@@ -45,8 +45,8 @@ spec:
         persistentVolumeClaim:
           claimName: {{ default (print ( include "dendrite.fullname" . ) "-search-pvc") $.Values.persistence.search.existingClaim | quote }}
       containers:
-      - name: {{ $.Chart.Name }}
-        {{- include "image.name" $.Values.image | nindent 8 }}
+      - name: {{ .Chart.Name }}
+        {{- include "image.name" . | nindent 8 }}
         args:
           - '--config'
           - '/etc/dendrite/dendrite.yaml'
diff --git a/helm/dendrite/templates/jobs.yaml b/helm/dendrite/templates/jobs.yaml
index 76915694..c10f358b 100644
--- a/helm/dendrite/templates/jobs.yaml
+++ b/helm/dendrite/templates/jobs.yaml
@@ -8,6 +8,7 @@ metadata:
   name: {{ $name }}
   labels:
     app.kubernetes.io/component: signingkey-job
+    {{- include "dendrite.labels" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -80,7 +81,7 @@ spec:
           name: signing-key
           readOnly: true
       - name: generate-key
-        {{- include "image.name" $.Values.image | nindent 8 }}
+        {{- include "image.name" . | nindent 8 }}
         command:
         - sh 
         - -c
diff --git a/helm/dendrite/templates/service.yaml b/helm/dendrite/templates/service.yaml
index 365a43f0..3b571df1 100644
--- a/helm/dendrite/templates/service.yaml
+++ b/helm/dendrite/templates/service.yaml
@@ -13,5 +13,5 @@ spec:
   ports:
     - name: http
       protocol: TCP
-      port: 8008
+      port: {{ .Values.service.port }}
       targetPort: 8008
\ No newline at end of file
diff --git a/helm/dendrite/values.yaml b/helm/dendrite/values.yaml
index 2c6e8094..87027a88 100644
--- a/helm/dendrite/values.yaml
+++ b/helm/dendrite/values.yaml
@@ -1,8 +1,10 @@
 image:
   # -- Docker repository/image to use
-  name: "ghcr.io/matrix-org/dendrite-monolith:v0.10.8"
+  repository: "ghcr.io/matrix-org/dendrite-monolith"
   # -- Kubernetes pullPolicy
   pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: ""
 
 
 # signing key to use
@@ -345,4 +347,4 @@ ingress:
 
 service:
   type: ClusterIP
-  port: 80
+  port: 8008