fixing support for various parameters georchestra-backup-ldap

camptocamp · Sep 30, 2024 · 5ea4509 · 5ea4509
1 parent 84de4e4
commit 5ea4509
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/georchestra-backup-ldap/Chart.yaml b/georchestra-backup-ldap/Chart.yaml
@@ -15,7 +15,7 @@ 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: 0.1.7
+version: 0.2.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

diff --git a/georchestra-backup-ldap/templates/cronjob.yaml b/georchestra-backup-ldap/templates/cronjob.yaml
@@ -19,11 +19,11 @@ spec:
         spec:
           {{- with $job.imagePullSecrets }}
           imagePullSecrets:
-            {{- toYaml . | nindent 12 }}
+            {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- with $job.securityContext }}
+          {{- with $job.podSecurityContext }}
           securityContext:
-            {{ toYaml . | indent 12 }}
+            {{ toYaml . | nindent 10 }}
           {{- end }}
           containers:
           - name: {{ .Chart.Name }}
@@ -43,7 +43,11 @@ spec:
               cd /backup && rm `ls -t | awk 'NR>{{ .Values.configuration.keepLastBackups }}'`
             {{- with $job.resources }}
             resources:
-              {{ toYaml . | indent 14 }}
+              {{ toYaml . | nindent 12 }}
+            {{- end }}
+            {{- with $job.securityContext }}
+            securityContext:
+              {{ toYaml . | nindent 12 }}
             {{- end }}
           restartPolicy: {{ $job.restartPolicy }}
           volumes:
@@ -52,13 +56,13 @@ spec:
                 claimName: {{ include "georchestra-backup-ldap.fullname" . }}-pvc
           {{- with $job.nodeSelector }}
           nodeSelector:
-            {{ toYaml . | indent 12 }}
+            {{ toYaml . | nindent 10 }}
           {{- end }}
           {{- with $job.affinity }}
           affinity:
-            {{ toYaml . | indent 12 }}
+            {{ toYaml . | nindent 10 }}
           {{- end }}
           {{- with $job.tolerations }}
           tolerations:
-            {{ toYaml . | indent 12 }}
+            {{ toYaml . | nindent 10 }}
           {{- end }}
diff --git a/georchestra-backup-ldap/values.yaml b/georchestra-backup-ldap/values.yaml
@@ -24,13 +24,14 @@ job:
     # requests:
     #   cpu: 100m
     #   memory: 128Mi
-  securityContext: {}
+  podSecurityContext: {}
     # capabilities:
     #   drop:
     #   - ALL
     # readOnlyRootFilesystem: true
     # runAsNonRoot: true
     # runAsUser: 1000
+  securityContext: {}
   imagePullSecrets: []
 
 configuration: