Solidify fireflyiii and vaultwarden database system (#860)

* Solidify fireflyiii database system

* bump major as it's breaking

* do the same with vaultwarden

* whoopsies

* hmm

* revert and clean

* another breaking change for vaulwarden

charts/stable/fireflyiii/Chart.yaml

@@ -27,4 +27,4 @@ name: fireflyiii
 sources:
 - https://github.com/firefly-iii/firefly-iii/
 type: application
-version: 5.8.0
+version: 6.0.0

charts/stable/fireflyiii/SCALE/ix_values.yaml

@@ -28,11 +28,11 @@ env:
 envValueFrom:
   DB_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: postgresql_host
   DB_PASSWORD:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: postgresql-password
 
 # Enabled postgres
@@ -40,7 +40,7 @@ postgresql:
   enabled: true
   postgresqlUsername: fireflyiii
   postgresqlDatabase: fireflyiii
-  existingSecret: dbcreds
+  existingSecret: "{{ .Release.Name }}-dbcreds"
   persistence:
     db:
       storageClass: "SCALE-ZFS"

charts/stable/fireflyiii/templates/_secrets.tpl

@@ -1,8 +1,12 @@
+{{/* Define the secrets */}}
+{{- define "fireflyiii.secrets" -}}
+
+---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: dbcreds
+  name: {{ .Release.Name }}-dbcreds
-{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
+{{- $previous := lookup "v1" "Secret" .Release.Namespace ( ( printf "%v-%v"  .Release.Name "dbcreds" ) | quote ) }}
 {{- $dbPass := "" }}
 data:
 {{- if $previous }}
@@ -17,3 +21,5 @@ data:
   url: {{ ( printf "%v%v:%v@%v-%v:%v/%v" "postgresql://" .Values.postgresql.postgresqlUsername $dbPass .Release.Name "postgresql" "5432" .Values.postgresql.postgresqlDatabase  ) | b64enc | quote }}
   postgresql_host: {{ ( printf "%v-%v" .Release.Name "postgresql" ) | b64enc | quote }}
 type: Opaque
+
+{{- end -}}

charts/stable/fireflyiii/templates/common.yaml

@@ -3,3 +3,6 @@
 
 {{/* Render the templates */}}
 {{ include "common.all" . }}
+
+{{/* Render secrets for fireflyiii */}}
+{{- include "fireflyiii.secrets" . }}

charts/stable/fireflyiii/values.yaml

@@ -48,11 +48,11 @@ env:
 envValueFrom:
   DB_HOST:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: postgresql_host
   DB_PASSWORD:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: postgresql-password
 
 persistence:
@@ -69,4 +69,4 @@ postgresql:
   enabled: true
   postgresqlUsername: firefly
   postgresqlDatabase: firefly
-  existingSecret: dbcreds
+  existingSecret: "{{ .Release.Name }}-dbcreds"

charts/stable/vaultwarden/Chart.yaml

@@ -31,4 +31,4 @@ name: vaultwarden
 sources:
 - https://github.com/dani-garcia/vaultwarden
 type: application
-version: 4.8.0
+version: 5.0.0

charts/stable/vaultwarden/SCALE/ix_values.yaml

@@ -14,15 +14,15 @@ envTpl:
 
 envFrom:
   - configMapRef:
-      name: vaultwardenconfig
+      name: "{{ .Release.Name }}-vaultwardenconfig"
   - secretRef:
-      name: vaultwardensecret
+      name: "{{ .Release.Name }}-vaultwardensecret"
 
 
 envValueFrom:
   DATABASE_URL:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: url
 
 database:
@@ -42,7 +42,7 @@ postgresql:
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
-  existingSecret: dbcreds
+  existingSecret: "{{ .Release.Name }}-dbcreds"
   persistence:
     db:
       storageClass: "SCALE-ZFS"

charts/stable/vaultwarden/templates/_configmap.tpl

@@ -4,7 +4,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: vaultwardenconfig
+  name: {{ .Release.Name }}-vaultwardenconfig
 data:
   ROCKET_PORT: "8080"
   SIGNUPS_ALLOWED: {{ .Values.vaultwarden.allowSignups | quote }}

charts/stable/vaultwarden/templates/_secrets.tpl

@@ -20,7 +20,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: vaultwardensecret
+  name: {{ .Release.Name }}-vaultwardensecret
 data:
   {{- if ne $adminToken "" }}
   ADMIN_TOKEN: {{ $adminToken }}
@@ -41,8 +41,8 @@ kind: Secret
 metadata:
   labels:
     {{- include "common.labels" . | nindent 4 }}
-  name: dbcreds
+  name: {{ .Release.Name }}-dbcreds
-{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
+{{- $previous := lookup "v1" "Secret" .Release.Namespace ( ( printf "%v-%v"  .Release.Name "dbcreds" ) | quote ) }}
 {{- $dbPass := "" }}
 data:
 {{- if $previous }}

charts/stable/vaultwarden/values.yaml

@@ -26,14 +26,14 @@ envTpl:
 
 envFrom:
   - configMapRef:
-      name: vaultwardenconfig
+      name: "{{ .Release.Name }}-vaultwardenconfig"
   - secretRef:
-      name: vaultwardensecret
+      name: "{{ .Release.Name }}-vaultwardensecret"
 
 envValueFrom:
   DATABASE_URL:
     secretKeyRef:
-      name: dbcreds
+      name: "{{ .Release.Name }}-dbcreds"
       key: url
 
 database:
@@ -158,4 +158,4 @@ postgresql:
   enabled: true
   postgresqlUsername: vaultwarden
   postgresqlDatabase: vaultwarden
-  existingSecret: dbcreds
+  existingSecret: "{{ .Release.Name }}-dbcreds"