From 3980b451295429188cdb86f383ae12e26974746d Mon Sep 17 00:00:00 2001 From: Kjeld Schouten-Lebbing Date: Tue, 31 Aug 2021 00:00:59 +0200 Subject: [PATCH] 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 | 2 +- charts/stable/fireflyiii/SCALE/ix_values.yaml | 6 +++--- .../templates/{secrets.yaml => _secrets.tpl} | 10 ++++++++-- charts/stable/fireflyiii/templates/common.yaml | 3 +++ charts/stable/fireflyiii/values.yaml | 6 +++--- charts/stable/vaultwarden/Chart.yaml | 2 +- charts/stable/vaultwarden/SCALE/ix_values.yaml | 8 ++++---- charts/stable/vaultwarden/templates/_configmap.tpl | 2 +- charts/stable/vaultwarden/templates/_secrets.tpl | 6 +++--- charts/stable/vaultwarden/values.yaml | 8 ++++---- 10 files changed, 31 insertions(+), 22 deletions(-) rename charts/stable/fireflyiii/templates/{secrets.yaml => _secrets.tpl} (77%) diff --git a/charts/stable/fireflyiii/Chart.yaml b/charts/stable/fireflyiii/Chart.yaml index 446697a685c..cd4e0b2bf04 100644 --- a/charts/stable/fireflyiii/Chart.yaml +++ b/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 diff --git a/charts/stable/fireflyiii/SCALE/ix_values.yaml b/charts/stable/fireflyiii/SCALE/ix_values.yaml index a94de5b58ef..e6c0856ca89 100644 --- a/charts/stable/fireflyiii/SCALE/ix_values.yaml +++ b/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" diff --git a/charts/stable/fireflyiii/templates/secrets.yaml b/charts/stable/fireflyiii/templates/_secrets.tpl similarity index 77% rename from charts/stable/fireflyiii/templates/secrets.yaml rename to charts/stable/fireflyiii/templates/_secrets.tpl index 5d262741617..1c9f0103a95 100644 --- a/charts/stable/fireflyiii/templates/secrets.yaml +++ b/charts/stable/fireflyiii/templates/_secrets.tpl @@ -1,8 +1,12 @@ +{{/* Define the secrets */}} +{{- define "fireflyiii.secrets" -}} + +--- apiVersion: v1 kind: Secret metadata: - name: dbcreds -{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} + name: {{ .Release.Name }}-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 -}} diff --git a/charts/stable/fireflyiii/templates/common.yaml b/charts/stable/fireflyiii/templates/common.yaml index 64e027ac0fa..096dd2fef91 100644 --- a/charts/stable/fireflyiii/templates/common.yaml +++ b/charts/stable/fireflyiii/templates/common.yaml @@ -3,3 +3,6 @@ {{/* Render the templates */}} {{ include "common.all" . }} + +{{/* Render secrets for fireflyiii */}} +{{- include "fireflyiii.secrets" . }} diff --git a/charts/stable/fireflyiii/values.yaml b/charts/stable/fireflyiii/values.yaml index 21b500850d3..633c96e681d 100644 --- a/charts/stable/fireflyiii/values.yaml +++ b/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" diff --git a/charts/stable/vaultwarden/Chart.yaml b/charts/stable/vaultwarden/Chart.yaml index 2abd5a02fff..717d9d87222 100644 --- a/charts/stable/vaultwarden/Chart.yaml +++ b/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 diff --git a/charts/stable/vaultwarden/SCALE/ix_values.yaml b/charts/stable/vaultwarden/SCALE/ix_values.yaml index 8a4b54a0a32..d6af750a431 100644 --- a/charts/stable/vaultwarden/SCALE/ix_values.yaml +++ b/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" diff --git a/charts/stable/vaultwarden/templates/_configmap.tpl b/charts/stable/vaultwarden/templates/_configmap.tpl index 8809925abdf..aa7ddb01bf5 100644 --- a/charts/stable/vaultwarden/templates/_configmap.tpl +++ b/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 }} diff --git a/charts/stable/vaultwarden/templates/_secrets.tpl b/charts/stable/vaultwarden/templates/_secrets.tpl index 6a7bf408bb8..1cb019e48f3 100644 --- a/charts/stable/vaultwarden/templates/_secrets.tpl +++ b/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 -{{- $previous := lookup "v1" "Secret" .Release.Namespace "dbcreds" }} + name: {{ .Release.Name }}-dbcreds +{{- $previous := lookup "v1" "Secret" .Release.Namespace ( ( printf "%v-%v" .Release.Name "dbcreds" ) | quote ) }} {{- $dbPass := "" }} data: {{- if $previous }} diff --git a/charts/stable/vaultwarden/values.yaml b/charts/stable/vaultwarden/values.yaml index 9cfc0aa76a6..28348b1942e 100644 --- a/charts/stable/vaultwarden/values.yaml +++ b/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"