Merge branch 'main' into app-version-image-tag

Author: wrenix

charts/nextcloud/README.md

@@ -222,6 +222,7 @@ The following table lists the configurable parameters of the nextcloud chart and
 | `cronjob.cronjob.podLabels`                                 | An array of service labels                                                                          | `nil`                                                        |
 | `cronjob.cronjob.annotations`                               | An array of service annotations                                                                     | `nil`                                                        |
 | `cronjob.cronjob.backoffLimit`                              | The number of retries before marking a job as failed                                                | `1`                                                          |
+| `cronjob.cronjob.activeDeadlineSeconds`                     | The number of seconds before cancelling a job                                                       | `nil`                                                          |
 | `cronjob.cronjob.affinity`                                  | The affinity settings for the cron job                                                              | `{}`                                                         |
 | `cronjob.cronjob.resources`                                 | The resource requests/limits for the cron job                                                       | `{}`                                                         |
 | `cronjob.cronjob.priorityClassName`                         | Priority Class for cronjob. Defaults to .priorityClassName                                          | `nil`                                                        |

charts/nextcloud/templates/cronjob.yaml

@@ -28,6 +28,9 @@ spec:
         {{- end }}
     spec:
       backoffLimit: {{ .backoffLimit }}
+      {{- with .activeDeadlineSeconds }}
+      activeDeadlineSeconds: {{ . }}
+      {{- end }}
       template:
         metadata:
           labels:

charts/nextcloud/values.yaml

@@ -650,6 +650,7 @@ cronjob:
     schedule: "*/5 * * * *"
     successfulJobsHistoryLimit: 3
     failedJobsHistoryLimit: 5
+    activeDeadlineSeconds:
     # -- Additional labels for cronjob
     labels: {}
     # -- Additional labels for cronjob pod