From 9a97950b869040a5af84342597020c861f099c74 Mon Sep 17 00:00:00 2001 From: Teslamancer Date: Tue, 22 Nov 2022 17:49:57 -0700 Subject: [PATCH 1/5] added logging variables --- templates/configmap.yaml | 2 ++ values.yaml | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/templates/configmap.yaml b/templates/configmap.yaml index 126fb74..e3acd2b 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -39,3 +39,5 @@ data: SIGNUPS_DOMAINS_WHITELIST: {{ .Values.signupDomains | quote }} SIGNUPS_VERIFY: {{ .Values.signupsVerify | quote }} WEB_VAULT_ENABLED: {{ .Values.webVaultEnabled | quote }} + LOG_FILE: {{ .Values.logging.logfile | quote }} + LOG_LEVEL: {{ .Values.logging.loglevel | quote }} diff --git a/values.yaml b/values.yaml index fd58580..14c056c 100644 --- a/values.yaml +++ b/values.yaml @@ -231,6 +231,16 @@ storage: ## dataDir: "/data" +## @section Logging Configuration +## +logging: + ## @param logging.logfile Specify logfile path for output log + ## + logfile: "/data/vaultwarden.log" + ## @param logging.loglevel Specify the log level + ## + loglevel: "warn" + ## @section Extra containers Configuration ## From fbef5662ded6e33eec07c37ff8aca295daf4544e Mon Sep 17 00:00:00 2001 From: Teslamancer Date: Tue, 22 Nov 2022 17:52:42 -0700 Subject: [PATCH 2/5] version bump --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 2361f3f..63a76eb 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -7,7 +7,7 @@ keywords: sources: - https://github.com/guerzon/vaultwarden - https://github.com/dani-garcia/vaultwarden -appVersion: 1.24.0 +appVersion: 1.25.0 maintainers: - name: Lester Guerzon email: lester@pidnull.io From fcfcd6bcc567886af6f9396fd76b127b09ac23b7 Mon Sep 17 00:00:00 2001 From: Teslamancer Date: Tue, 22 Nov 2022 17:56:27 -0700 Subject: [PATCH 3/5] fixed version bump --- Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 63a76eb..d9cd4fc 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -7,9 +7,9 @@ keywords: sources: - https://github.com/guerzon/vaultwarden - https://github.com/dani-garcia/vaultwarden -appVersion: 1.25.0 +appVersion: 1.24.0 maintainers: - name: Lester Guerzon email: lester@pidnull.io url: https://github.com/guerzon -version: 0.5.0 +version: 0.6.0 From 53cbed1847f0b12fca79770a09583aad9ffe9703 Mon Sep 17 00:00:00 2001 From: Teslamancer Date: Thu, 5 Jan 2023 16:46:59 -0700 Subject: [PATCH 4/5] added persistentVolume Retention Policy --- templates/statefulset.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index 7528205..5701a3d 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -71,6 +71,9 @@ spec: serviceAccountName: {{ .Values.serviceAccount.name }} {{- end }} {{- if .Values.storage.enabled }} + persistentVolumeClaimRetentionPolicy: + whenDeleted: Retain + whenScaled: Retain volumeClaimTemplates: - metadata: name: vaultwarden-data From 9d4f369c5d26e388c9c6e1152c5beb102621779e Mon Sep 17 00:00:00 2001 From: Teslamancer Date: Tue, 2 May 2023 15:53:47 -0600 Subject: [PATCH 5/5] added additional storage options --- templates/statefulset.yaml | 12 ++++++++++-- values.yaml | 13 ++++++++++--- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/templates/statefulset.yaml b/templates/statefulset.yaml index 5701a3d..aa63220 100644 --- a/templates/statefulset.yaml +++ b/templates/statefulset.yaml @@ -67,10 +67,16 @@ spec: {{- if .Values.sidecars }} {{- toYaml .Values.sidecars | nindent 8 }} {{- end }} + {{- if .Values.storage.existingVolumeClaim }} + volumes: + - name: vaultwarden-data + persistentVolumeClaim: + claimName: {{ .Values.storage.existingVolumeClaim }} + {{- end }} {{- if .Values.serviceAccount.create }} serviceAccountName: {{ .Values.serviceAccount.name }} {{- end }} - {{- if .Values.storage.enabled }} + {{- if and .Values.storage.enabled (not .Values.storage.existingVolumeClaim) }} persistentVolumeClaimRetentionPolicy: whenDeleted: Retain whenScaled: Retain @@ -79,7 +85,9 @@ spec: name: vaultwarden-data spec: accessModes: - - "ReadWriteOnce" + {{- range .Values.storage.accessModes }} + - {{ . }} + {{- end }} resources: requests: storage: {{ .Values.storage.size }} diff --git a/values.yaml b/values.yaml index 14c056c..f4601e0 100644 --- a/values.yaml +++ b/values.yaml @@ -131,9 +131,9 @@ ingress: ## nginxAllowList: "" ## TODO: - ## - Add support for using cert-manager. - ## - Support for multiple TLS hostnames. - ## +## - Add support for using cert-manager. +## - Support for multiple TLS hostnames. +## ## Service configuration service: @@ -218,9 +218,16 @@ smtp: ## @section Storage Configuration ## storage: + ## @param storage.existingVolumeClaim Name of an existing volume claim created separately, which the statefulset will use instead of creating its own + ## If this is not an empty string, the other values below are ignored + ## + existingVolumeClaim: "" ## @param storage.enabled Enable configuration for persistent storage ## enabled: false + ## @param storage.enabled Enable configuration for persistent storage + ## + accessModes: ["ReadWriteOnce"] ## @param storage.size Storage size for /data ## size: "15Gi"