From 9ef411a6650342f93f0f845463e5912f93658009 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Tue, 14 May 2024 13:18:49 +0200
Subject: [PATCH] fix(conduit): update appVersion

---
 conduit/Chart.yaml                          |  4 ++--
 conduit/README.adoc                         | 18 ++++++++++++++----
 conduit/templates/deployment.yaml           |  4 +++-
 conduit/templates/wellknown/deployment.yaml |  4 +++-
 conduit/values.yaml                         |  6 ++++--
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/conduit/Chart.yaml b/conduit/Chart.yaml
index f2151b0..e80f5ce 100644
--- a/conduit/Chart.yaml
+++ b/conduit/Chart.yaml
@@ -3,9 +3,9 @@ name: conduit
 description: Conduit is a simple, fast and reliable chat server powered by Matrix.
 icon: https://conduit.rs/conduit.svg
 type: application
-version: 0.2.5
+version: 0.3.0
 # renovate: image=registry.gitlab.com/famedly/conduit/matrix-conduit
-appVersion: "0.6.0"
+appVersion: "0.7.0"
 maintainers:
   - name: WrenIX
     url: https://wrenix.eu
diff --git a/conduit/README.adoc b/conduit/README.adoc
index 1b5aa50..5461343 100644
--- a/conduit/README.adoc
+++ b/conduit/README.adoc
@@ -2,9 +2,9 @@
 
 = conduit
 
-image::https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square[Version: 0.2.5]
+image::https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square[Version: 0.3.0]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
-image::https://img.shields.io/badge/AppVersion-0.6.0-informational?style=flat-square[AppVersion: 0.6.0]
+image::https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square[AppVersion: 0.7.0]
 == Maintainers
 
 .Maintainers
@@ -142,9 +142,14 @@ helm uninstall conduit-release
 | `"IfNotPresent"`
 |
 
+| image.registry
+| string
+| `"registry.gitlab.com"`
+|
+
 | image.repository
 | string
-| `"registry.gitlab.com/famedly/conduit/matrix-conduit"`
+| `"famedly/conduit/matrix-conduit"`
 |
 
 | image.tag
@@ -332,9 +337,14 @@ helm uninstall conduit-release
 | `"IfNotPresent"`
 |
 
+| wellknown.image.registry
+| string
+| `"docker.io"`
+|
+
 | wellknown.image.repository
 | string
-| `"nginx"`
+| `"library/nginx"`
 |
 
 | wellknown.image.tag
diff --git a/conduit/templates/deployment.yaml b/conduit/templates/deployment.yaml
index c803d99..2145ec5 100644
--- a/conduit/templates/deployment.yaml
+++ b/conduit/templates/deployment.yaml
@@ -38,7 +38,9 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "v%s" .Chart.AppVersion) }}"
+          {{- with .Values.image }}
+          image: "{{ .registry }}/{{ .repository }}:{{ .tag | default (printf "v%s" $.Chart.AppVersion) }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http
diff --git a/conduit/templates/wellknown/deployment.yaml b/conduit/templates/wellknown/deployment.yaml
index 7db751b..eded4fc 100644
--- a/conduit/templates/wellknown/deployment.yaml
+++ b/conduit/templates/wellknown/deployment.yaml
@@ -36,7 +36,9 @@ spec:
         - name: wellknown
           securityContext:
             {{- toYaml .Values.wellknown.securityContext | nindent 12 }}
-          image: "{{ .Values.wellknown.image.repository }}:{{ .Values.wellknown.image.tag }}"
+          {{- with .Values.wellknown.image }}
+          image: "{{ .registry }}/{{ .repository }}:{{ .tag }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.wellknown.image.pullPolicy }}
           ports:
             - name: http
diff --git a/conduit/values.yaml b/conduit/values.yaml
index c5e8d6b..8a2f50d 100644
--- a/conduit/values.yaml
+++ b/conduit/values.yaml
@@ -5,7 +5,8 @@
 replicaCount: 1
 
 image:
-  repository: registry.gitlab.com/famedly/conduit/matrix-conduit
+  registry: registry.gitlab.com
+  repository: famedly/conduit/matrix-conduit
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -44,7 +45,8 @@ conduit:
 wellknown:
   enabled: true
   image:
-    repository: nginx
+    registry: docker.io
+    repository: library/nginx
     pullPolicy: IfNotPresent
     tag: "1.25"