feat: remove not needed stuff

drikqlis · Mar 15, 2024 · d089291 · d089291
1 parent fe68876
commit d089291
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 77 deletions.
diff --git a/charts/vaultwarden/Chart.yaml b/charts/vaultwarden/Chart.yaml
@@ -9,7 +9,7 @@ sources:
   - https://github.com/guerzon/vaultwarden
   - https://github.com/dani-garcia/vaultwarden
 appVersion: "1.30.5"
-version: 0.22.19
+version: 0.22.20
 kubeVersion: ">=1.12.0-0"
 
 dependencies:

diff --git a/charts/vaultwarden/templates/_helpers.tpl b/charts/vaultwarden/templates/_helpers.tpl
@@ -76,19 +76,4 @@ Return the appropriate apiVersion for podDisruptionBudget.
 {{- else -}}
 {{- print "policy/v1beta1" -}}
 {{- end -}}
-{{- end -}}
-
-{{/*
-Determine whether to use deployment or statefulset
-*/}}
-{{- define "vaultwarden.resourceType" -}}
-{{- if .Values.resourceType }}
-{{- .Values.resourceType }}
-{{- else }}
-{{- if (and .Values.data (ne .Values.database.type "default")) }}
-{{- "Deployment" }}
-{{- else }}
-{{- "StatefulSet" }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{- end -}}
diff --git a/charts/vaultwarden/templates/deployment.yaml b/charts/vaultwarden/templates/deployment.yaml
@@ -1,4 +1,3 @@
-{{- if eq (include "vaultwarden.resourceType" .) "Deployment" }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -48,5 +47,4 @@ spec:
         - name: {{ $pvc.metadata.name }}
           persistentVolumeClaim:
             claimName: {{ $newName }}
-        {{- end }}
-{{- end }}
+        {{- end }}
diff --git a/charts/vaultwarden/templates/pvc.yaml b/charts/vaultwarden/templates/pvc.yaml
@@ -1,10 +1,8 @@
-{{- if eq (include "vaultwarden.resourceType" .) "Deployment" }}
 {{- range $pvc := (fromYaml (include "vaultwarden.pvcSpec" .)).volumeClaimTemplates }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
 {{- $newName := printf "%s-%s-0" $pvc.metadata.name $.Release.Name }}
 {{- $newPvc := merge (dict "metadata" (dict "name" $newName)) $pvc }}
 {{ $newPvc | toYaml }}
-{{- end }}
 {{- end }}
diff --git a/charts/vaultwarden/templates/statefulset.yaml b/charts/vaultwarden/templates/statefulset.yaml
diff --git a/charts/vaultwarden/values.yaml b/charts/vaultwarden/values.yaml
@@ -30,11 +30,6 @@ image:
 ##
 fullnameOverride: ""
 
-## @param resourceType Can be either Deployment or StatefulSet
-## Overwrite automatic resource type detection by specifying the resource type
-##
-resourceType: ""
-
 ## @param commonAnnotations Annotations for the deployment or statefulset
 ##
 commonAnnotations: {}
@@ -238,9 +233,9 @@ webVaultEnabled: "true"
 
 database:
   ## @param database.type Database type, either mysql or postgresql
-  ## Default is a sqlite database.
+  ## Default is a postgresql database.
   ##
-  type: "default"
+  type: "postgresql"
   ## @param database.host Database hostname or IP address
   ##
   host: ""