From 6ef4ff7d58d365948f84351bfd974c79457d4254 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 24 Apr 2023 03:25:24 +0200
Subject: [PATCH] fix(hedgedoc): Adjust secret name for broken dependency

---
 charts/hedgedoc/Chart.yaml                                    | 2 +-
 charts/hedgedoc/README.md                                     | 2 +-
 charts/hedgedoc/templates/_helpers.tpl                        | 4 +---
 charts/hedgedoc/templates/secret.yaml                         | 2 +-
 charts/hedgedoc/tests/__snapshot__/98_snapshot_test.yaml.snap | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/hedgedoc/Chart.yaml b/charts/hedgedoc/Chart.yaml
index 422d8ff95..f163c47cf 100644
--- a/charts/hedgedoc/Chart.yaml
+++ b/charts/hedgedoc/Chart.yaml
@@ -11,7 +11,7 @@ keywords:
 sources:
     - https://github.com/hedgedoc/hedgedoc/tree/master
     - https://git.shivering-isles.com/shivering-isles/infrastructure-gitops/-/tree/main/charts/hedgedoc
-version: 0.1.2
+version: 0.1.3
 # renovate: image=quay.io/hedgedoc/hedgedoc
 appVersion: 1.9.7
 maintainers:
diff --git a/charts/hedgedoc/README.md b/charts/hedgedoc/README.md
index 652329b5b..dceb58f28 100644
--- a/charts/hedgedoc/README.md
+++ b/charts/hedgedoc/README.md
@@ -1,6 +1,6 @@
 # hedgedoc
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.7](https://img.shields.io/badge/AppVersion-1.9.7-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.7](https://img.shields.io/badge/AppVersion-1.9.7-informational?style=flat-square)
 
 A platform to write and share markdown.
 
diff --git a/charts/hedgedoc/templates/_helpers.tpl b/charts/hedgedoc/templates/_helpers.tpl
index f2c532d11..c99b8a968 100644
--- a/charts/hedgedoc/templates/_helpers.tpl
+++ b/charts/hedgedoc/templates/_helpers.tpl
@@ -67,10 +67,8 @@ Get the postgresql secret.
 {{- define "hedgedoc.postgresql.secretName" -}}
 {{- if (and (or .Values.postgresql.enabled .Values.postgresql.postgresqlHostname) .Values.postgresql.auth.existingSecret) }}
     {{- printf "%s" (tpl .Values.postgresql.auth.existingSecret $) -}}
-{{- else if .Values.postgresql.enabled -}}
-    {{- printf "%s-postgresql" (tpl .Release.Name $) -}}
 {{- else -}}
-    {{- printf "%s" (include "common.names.fullname" .) -}}
+    {{- printf "%s-postgresql" (tpl .Release.Name $) -}}
 {{- end -}}
 {{- end -}}
 
diff --git a/charts/hedgedoc/templates/secret.yaml b/charts/hedgedoc/templates/secret.yaml
index e21c66fc1..437bca31d 100644
--- a/charts/hedgedoc/templates/secret.yaml
+++ b/charts/hedgedoc/templates/secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: dotfile-secret
+  name: {{ include "hedgedoc.fullname" . }}
 data:
   {{- with .Values.config.session.secret }}
   CMD_SESSION_SECRET: {{ . | b64enc }}
diff --git a/charts/hedgedoc/tests/__snapshot__/98_snapshot_test.yaml.snap b/charts/hedgedoc/tests/__snapshot__/98_snapshot_test.yaml.snap
index 57561565c..706e250f6 100644
--- a/charts/hedgedoc/tests/__snapshot__/98_snapshot_test.yaml.snap
+++ b/charts/hedgedoc/tests/__snapshot__/98_snapshot_test.yaml.snap
@@ -110,7 +110,7 @@ should match basic snapshot:
     data: null
     kind: Secret
     metadata:
-      name: dotfile-secret
+      name: RELEASE-NAME-hedgedoc
   5: |
     apiVersion: v1
     kind: Service
-- 
GitLab