fix: using find instead of ls to cleanup old backups (fixes #31) (#32)

* fix: using find instead of ls to cleanup old backups (fixes #31)

Tests: `helm template .` looks good

* fix: updating versions (following @edevosc2c's feedback)

* feat: backup-ldap - retention set to 30 days

sounds more reasonable in case of issues, than 10 days.

georchestra-backup-ldap/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.0
+version: 2.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "2.0.0"

georchestra-backup-ldap/templates/cronjob.yaml

@@ -40,7 +40,7 @@ spec:
               /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.orgsRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif;
               /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.pendingorgsRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif;
               /usr/bin/ldapsearch -H {{ $ldapTargetConfiguration.service }} -xLLL -D "{{ $ldapTargetConfiguration.adminDn }}" -w {{ $ldapTargetConfiguration.secret }} -b "{{ $ldapTargetConfiguration.rolesRdn }},{{ $ldapTargetConfiguration.baseDn }}" >> /backup/ldap-$(date +"%s").ldif;
-              cd /backup && rm `ls -t | awk 'NR>{{ .Values.configuration.keepLastBackups }}'`
+              find /backup -name '*.ldif' -mtime +{{.Values.configuration.backupRetentionDays}} -delete ;
             {{- with $job.resources }}
             resources:
               {{ toYaml . | nindent 12 }}
@@ -65,4 +65,4 @@ spec:
           {{- with $job.tolerations }}
           tolerations:
             {{ toYaml . | nindent 10 }}
-          {{- end }}
+          {{- end }}

georchestra-backup-ldap/values.yaml

@@ -35,7 +35,7 @@ job:
   imagePullSecrets: []
 
 configuration:
-  keepLastBackups: "10"
+  backupRetentionDays: "30"
   ldapTarget:
     # the url to the ldap kubernetes service
     service: "ldap://georchestra-ldap-svc:389"
@@ -74,4 +74,4 @@ persistence:
   size: 5Gi
   ## Use an existing PV
   ##
-  # existingPV:
+  # existingPV: