From a4326fc802600a0982f02377e194e90fb10905b9 Mon Sep 17 00:00:00 2001
From: Carlos Ravelo <ravelo.carlos@gmail.com>
Date: Mon, 26 Nov 2018 22:57:36 -0500
Subject: [PATCH] Changed rdiff backup docker to take in params Added a cleanup
 cronjob

---
 .idea/encodings.xml            |  4 ++++
 delete_jobs.sh                 |  8 --------
 docker/rdiff-backup/Dockerfile |  2 +-
 helmfile.d/60-backup.yaml      | 36 +++++++++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 12 deletions(-)
 create mode 100644 .idea/encodings.xml
 delete mode 100755 delete_jobs.sh

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 00000000..15a15b21
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/delete_jobs.sh b/delete_jobs.sh
deleted file mode 100755
index b97c67a9..00000000
--- a/delete_jobs.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-for j in $(kubectl get jobs --namespace=services -o custom-columns=:.metadata.name)
-do
-    kubectl delete jobs $j &
-done
diff --git a/docker/rdiff-backup/Dockerfile b/docker/rdiff-backup/Dockerfile
index 33024470..759fee19 100644
--- a/docker/rdiff-backup/Dockerfile
+++ b/docker/rdiff-backup/Dockerfile
@@ -6,4 +6,4 @@ VOLUME /media/backup
 # Docs: https://www.nongnu.org/rdiff-backup/docs.html
 RUN apk update && apk add --no-cache rdiff-backup && rm -rf /tmp/* /var/tmp/*
 
-CMD rdiff-backup -v5 /media/main /media/backup
+ENTRYPOINT ["rdiff-backup", "-v5"]
diff --git a/helmfile.d/60-backup.yaml b/helmfile.d/60-backup.yaml
index 023dc172..5bd78f76 100644
--- a/helmfile.d/60-backup.yaml
+++ b/helmfile.d/60-backup.yaml
@@ -53,11 +53,41 @@ releases:
     namespace: services
     chart: ../charts/cronjob
     values:
-      # Every hour
-      - schedule: "0 */1 * * *"
+      # Twice a day at midnight and midday
+      - schedule: "0 0,12 * * *"
       - image:
           repository: gandazgul/rdiff-backup
-          tag: v3
+          tag: v7
+          args:
+            - /media/main
+            - /media/backup
+      - volumes:
+          - name: main-volume
+            persistentVolumeClaim:
+              claimName: main-volume
+          - name: backup-volume
+            persistentVolumeClaim:
+              claimName: backup-volume
+      - volumeMounts:
+          - name: main-volume
+            mountPath: /media/main
+          - name: backup-volume
+            mountPath: /media/backup
+
+  - name: clean-incremental-backups
+    namespace: services
+    chart: ../charts/cronjob
+    values:
+      # Every day at midnight
+      - schedule: "0 0 * * *"
+      - image:
+          repository: gandazgul/rdiff-backup
+          tag: v7
+          args:
+            - --remove-older-than
+            - 4W
+            - --force
+            - /media/backup
       - volumes:
           - name: main-volume
             persistentVolumeClaim: