chore: revert changes

drikqlis · Mar 14, 2024 · fc4dca4 · fc4dca4
1 parent b3f888b
commit fc4dca4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 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-alpine"
-version: 0.22.14
+version: 0.22.15
 kubeVersion: ">=1.12.0-0"
 
 dependencies:

diff --git a/charts/vaultwarden/templates/deployment.yaml b/charts/vaultwarden/templates/deployment.yaml
@@ -29,9 +29,15 @@ spec:
       labels:
         app.kubernetes.io/component: vaultwarden
         {{- include "vaultwarden.selectorLabels" . | nindent 8 }}
+      {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha1sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha1sum }}
+        {{- with .Values.podAnnotations }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- include "vaultwarden.podSpec" . | nindent 6 }}
       volumes:
@@ -41,4 +47,4 @@ spec:
           persistentVolumeClaim:
             claimName: {{ $newName }}
         {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/vaultwarden/templates/secrets.yaml b/charts/vaultwarden/templates/secrets.yaml
@@ -1,7 +1,8 @@
+{{ if not (and ( .Values.smtp.existingSecret ) ( .Values.adminToken.existingSecret )) }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{- include "vaultwarden.fullname" . }}
+  name: {{ include "vaultwarden.fullname" . }}
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/component: vaultwarden
@@ -12,3 +13,7 @@ data:
   SMTP_PASSWORD: {{ .Values.smtp.password.value | b64enc | quote }}
   SMTP_USERNAME: {{ .Values.smtp.username.value | b64enc | quote }}
   {{- end }}
+  {{- if not ( .Values.adminToken.existingSecret ) }}
+  ADMIN_TOKEN: {{ .Values.adminToken.value | b64enc | quote }}
+  {{- end }}
+{{ end }}