switch to apikey instead of plain username and password

bitwarden/Bitwarden_export_Cronjobs.yaml

@@ -0,0 +1,66 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: bwbackup
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: bitwarden-backup
+  namespace: bwbackup
+spec:
+  schedule: "0 0 * * *"
+  jobTemplate:
+    spec:
+      ttlSecondsAfterFinished: 100
+      template:
+        spec:
+          containers:
+          - name:  bitwarden-backup
+            image: gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1
+            command:
+              - /bin/sh
+              - "-c"
+              - "/config/export_bitwarden.sh"
+            env:
+            - name: BW_CLIENTID
+              valueFrom:
+                 secretKeyRef:
+                   name: bitwarden-credentials
+                   key: BW_CLIENTID
+            - name: BW_CLIENTSECRET
+              valueFrom:
+                 secretKeyRef:
+                   name: bitwarden-credentials
+                   key: BW_CLIENTSECRET
+            volumeMounts:
+            - name: scripts
+              mountPath: /config
+            - name: bitwarden-vault-backup
+              mountPath: /backup
+          restartPolicy: Always
+          volumes:
+          - name: scripts
+            configMap:
+              name: bitwarden-export-scripts
+              defaultMode: 0555
+          - name: bitwarden-vault-backup
+            persistentVolumeClaim:
+              claimName: bitwarden-vault-backup
+          restartPolicy: Never
+
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: bitwarden-vault-backup
+  namespace: bwbackup
+  annotations:
+    fileType: Backup
+spec:
+  storageClassName: nfs-storage-fastaccess
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 10Gi

bitwarden/Bitwarden_export_jobs.yaml

@@ -1,64 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: bwbackup
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: bitwarden-backup
-  namespace: bwbackup
-spec:
-  ttlSecondsAfterFinished: 100
-  template:
-    spec:
-      containers:
-      - name:  bitwarden-backup
-        image: gitea.tryton.geeraert.eu/pi-ux-ce/bitwarden_cli:1.0.1
-        command:
-          - /bin/sh
-          - "-c"
-          - "/config/export_bitwarden.sh"
-        env:
-        - name: BITWARDEN_USERNAME
-          valueFrom:
-             secretKeyRef:
-               name: bitwarden-credentials
-               key: BITWARDEN_USERNAME
-        - name: BITWARDEN_PASSWORD
-          valueFrom:
-             secretKeyRef:
-               name: bitwarden-credentials
-               key: BITWARDEN_PASSWORD
-        volumeMounts:
-        - name: scripts
-          mountPath: /config
-        - name: bitwarden-vault-backup
-          mountPath: /backup
-      restartPolicy: Always
-      volumes:
-      - name: scripts
-        configMap:
-          name: bitwarden-export-scripts
-          defaultMode: 0555
-      - name: bitwarden-vault-backup
-        persistentVolumeClaim:
-          claimName: bitwarden-vault-backup
-      restartPolicy: Never
-  backoffLimit: 4
-
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: bitwarden-vault-backup
-  namespace: bwbackup
-  annotations:
-    fileType: Backup
-spec:
-  storageClassName: nfs-storage-fastaccess
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 10Gi

bitwarden/bitwarden.secret.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 data:
-  BITWARDEN_PASSWORD: SW1wcmV6YTU1NQ==
-  BITWARDEN_USERNAME: dmFsdmFua2FydEBvcmFuZ2UuZnI=
+  BW_CLIENTID: dXNlci43MGVmNGYxNi1kM2MwLTRmYWItYWI3OC1hZjg5MDEwNmE2ZDk=
+  BW_CLIENTSECRET: UlJZVGd3R0pUSjlHVDQwc3dZTklobzlrNUVYYTJv
 kind: Secret
 metadata:
   name: bitwarden-credentials

bitwarden/bitwarden_export_scripts.configmap.yaml

@@ -3,8 +3,8 @@ data:
   export_bitwarden.sh: |
     #!/usr/bin/env bash
     bw config server https://bitwarden.tryton.geeraert.eu/
-    export BW_key=$(bw login $BITWARDEN_USERNAME  $BITWARDEN_PASSWORD --raw)
-    bw list items --session $BW_key >> /backup/backup_$(date "+%Y-%m-%d_%Hh-%m").json
+    bw login --apikey
+    bw list items  >> /backup/backup_$(date "+%Y-%m-%d_%Hh-%m").json
 kind: ConfigMap
 metadata:
   creationTimestamp: null