diff --git a/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml b/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml index 1753eb6..0539424 100644 --- a/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml +++ b/vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml @@ -9,42 +9,18 @@ metadata: spec: project: {{ .Values.argocd.project }} source: - repoURL: "tccr.io/truecharts" + repoURL: "https://guerzon.github.io/vaultwarden" chart: vaultwarden - targetRevision: 28.x + targetRevision: v0.29.x helm: releaseName: vaultwarden valuesObject: - workload: - main: - podSpec: - containers: - main: - env: - DOMAIN: {{ .Values.vaultwarden.FQDN }} - persistence: - config: - enabled: true - mountPath: /config - type: pvc - namespace: {{ .Values.mainNamespace }} - accessModes: ReadWriteOnce - size: 100Mi - storageClass: {{ .Values.generalConfigStorageClass }} - database: - enabled: true - mountPath: /database - type: pvc - namespace: {{ .Values.mainNamespace }} - accessModes: ReadWriteOnce - size: 100Mi - storageClass: {{ .Values.generalConfigStorageClass }} - data: - enabled: true - mountPath: /data - type: pvc - namespace: {{ .Values.mainNamespace }} - existingClaim: thomflix-media + database: + type: postgresql + existingSecret: {{ .Values.vaultwarden.dbCluster.secretName }} + existingSecretKey: uri + ingress: + enabled: true destination: server: {{ .Values.mainDestination }} namespace: {{ .Values.mainNamespace }} @@ -56,8 +32,3 @@ spec: - ApplyOutOfSyncOnly=true - ServerSideApply=true - CreateNamespace=true - ignoreDifferences: - - group: apps - kind: Deployment - jsonPointers: - - /spec/template/spec/hostUsers diff --git a/vaultwarden-argocd-apps/values.yaml b/vaultwarden-argocd-apps/values.yaml index 9daf0e8..2c0b3e2 100644 --- a/vaultwarden-argocd-apps/values.yaml +++ b/vaultwarden-argocd-apps/values.yaml @@ -18,6 +18,7 @@ vaultwarden: dbCluster: numInstances: 3 size: 10Gi + secretName: vaultwarden-db-app dataPvc: name: vaultwarden-data storageClassName: ''