deployments/buildmaster: Update, Cleanup, add backup cron job

Author: kallisti5

deployments/buildmaster.yml

@@ -31,15 +31,13 @@ spec:
           mountPath: /var/instances/master/x86_gcc2
         - name: buildmaster-data-riscv64
           mountPath: /var/instances/master/riscv64
-        - name: buildmaster-package-buffer
-          mountPath: /var/instances/haikuports
       - name: buildmaster-x86-64
-        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-28-gd668
+        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-32-g6720
         #command: ["bootstrap", "x86_64"]
         command: ["loop"]
         volumeMounts:
-        - name: buildmaster-package-buffer
-          mountPath: /var/packages
+        - name: buildmaster-sources
+          mountPath: /var/sources
         - name: buildmaster-data-x86-64
           mountPath: /var/buildmaster
         - name: storage-secrets-master
@@ -57,12 +55,12 @@ spec:
           - name: REPOSITORY_TRIGGER_URL
             value: "https://depot.haiku-os.org/__repository/haikuports/source/haikuports_x86_64/import"
       - name: buildmaster-x86-gcc2
-        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-28-gd668
+        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-32-g6720
         #command: ["bootstrap", "x86_gcc2"]
         command: ["loop"]
         volumeMounts:
-        - name: buildmaster-package-buffer
-          mountPath: /var/packages
+        - name: buildmaster-sources
+          mountPath: /var/sources
         - name: buildmaster-data-x86-gcc2
           mountPath: /var/buildmaster
         - name: storage-secrets-master
@@ -80,12 +78,12 @@ spec:
           - name: REPOSITORY_TRIGGER_URL
             value: "https://depot.haiku-os.org/__repository/haikuports/source/haikuports_x86_gcc2/import"
       - name: buildmaster-riscv64
-        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-28-gd668
+        image: ghcr.io/haikuports/haikuporter/buildmaster:1.3.1-32-g6720
         #command: ["bootstrap", "riscv64"]
         command: ["loop"]
         volumeMounts:
-        - name: buildmaster-package-buffer
-          mountPath: /var/packages
+        - name: buildmaster-sources
+          mountPath: /var/sources
         - name: buildmaster-data-riscv64
           mountPath: /var/buildmaster
         - name: storage-secrets-master
@@ -103,6 +101,9 @@ spec:
           - name: REPOSITORY_TRIGGER_URL
             value: "https://depot.haiku-os.org/__repository/haikuports/source/haikuports_riscv64/import"
       volumes:
+        - name: buildmaster-sources
+          persistentVolumeClaim:
+            claimName: buildmaster-sources-pvc
         - name: buildmaster-data-x86-gcc2
           persistentVolumeClaim:
             claimName: buildmaster-data-x86-gcc2-pvc
@@ -112,9 +113,9 @@ spec:
         - name: buildmaster-data-riscv64
           persistentVolumeClaim:
             claimName: buildmaster-data-riscv64-pvc
-        - name: buildmaster-package-buffer
+        - name: buildmaster-old-packages
           persistentVolumeClaim:
-            claimName: buildmaster-package-buffer-pvc
+            claimName: buildmaster-packages-pvc
         - name: storage-secrets-master
           projected:
             sources:
@@ -279,3 +280,72 @@ spec:
             name: irccat
             port:
               number: 80
+---
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: buildmaster-pvbackup
+spec:
+  schedule: "0 6 * * 0"
+  successfulJobsHistoryLimit: 1
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          # volumes are attached to a single physical node (RWO), this ensures the backup
+          # job always starts on the same physical node where trac is running
+          affinity:
+            podAffinity:
+              requiredDuringSchedulingIgnoredDuringExecution:
+                - labelSelector:
+                    matchExpressions:
+                      - key: app
+                        operator: In
+                        values:
+                          - buildmaster
+                  topologyKey: kubernetes.io/hostname
+          containers:
+            - name: pvbackup
+              image: ghcr.io/haiku/pvbackup:1.4
+              args: ["backup", "buildmaster-data"]
+              env:
+                - name: S3_HOST
+                  value: "https://s3.eu-west-1.wasabisys.com"
+                - name: S3_BUCKET
+                  value: haiku-backups
+                - name: S3_MAX_AGE
+                  value: 15d
+                - name: S3_KEY
+                  valueFrom:
+                    secretKeyRef:
+                      name: s3-backup
+                      key: s3_key
+                - name: S3_SECRET
+                  valueFrom:
+                    secretKeyRef:
+                      name: s3-backup
+                      key: s3_secret
+                - name: TWOSECRET
+                  valueFrom:
+                    secretKeyRef:
+                      name: s3-backup
+                      key: twosecret
+              volumeMounts:
+                - name: buildmaster-data-x86-64
+                  mountPath: /pvs/buildmaster-data/x86_64
+                - name: buildmaster-data-x86-gcc2
+                  mountPath: /pvs/buildmaster-data/x86_gcc2
+                - name: buildmaster-data-riscv64
+                  mountPath: /pvs/buildmaster-data/riscv64
+          volumes:
+            - name: buildmaster-data-x86-64
+              persistentVolumeClaim:
+                claimName: buildmaster-data-x86-64-pvc
+            - name: buildmaster-data-x86-gcc2
+              persistentVolumeClaim:
+                claimName: buildmaster-data-x86-gcc2-pvc
+            - name: buildmaster-data-riscv64
+              persistentVolumeClaim:
+                claimName: buildmaster-data-riscv64-pvc
+          restartPolicy: Never