Merge "CronJobs: Allow cronjob history to be controlled"

cinder/templates/cron-job-cinder-volume-usage-audit.yaml

@@ -25,12 +25,14 @@ limitations under the License.
 {{- $serviceAccountName := "cinder-volume-usage-audit" }}
 {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
 ---
-apiVersion: batch/v2alpha1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: cinder-volume-usage-audit
 spec:
   schedule: {{ .Values.jobs.volume_usage_audit.cron | quote }}
+  successfulJobsHistoryLimit: {{ .Values.jobs.volume_usage_audit.history.success }}
+  failedJobsHistoryLimit: {{ .Values.jobs.volume_usage_audit.history.failed }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

cinder/values.yaml

@@ -51,6 +51,9 @@ images:
 jobs:
   volume_usage_audit:
     cron: "*/5 * * * *"
+    history:
+      success: 3
+      failed: 1
 
 pod:
   user:

keystone/templates/cron-job-credential-rotate.yaml

@@ -53,12 +53,14 @@ subjects:
     name: {{ $serviceAccountName }}
     namespace: {{ $envAll.Release.Namespace }}
 ---
-apiVersion: batch/v2alpha1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: keystone-credential-rotate
 spec:
   schedule: {{ .Values.jobs.credential_rotate.cron | quote }}
+  successfulJobsHistoryLimit: {{ .Values.jobs.credential_rotate.history.success }}
+  failedJobsHistoryLimit: {{ .Values.jobs.credential_rotate.history.failed }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

keystone/templates/cron-job-fernet-rotate.yaml

@@ -53,12 +53,14 @@ subjects:
     name: {{ $serviceAccountName }}
     namespace: {{ $envAll.Release.Namespace }}
 ---
-apiVersion: batch/v2alpha1
+apiVersion: batch/v1beta1
 kind: CronJob
 metadata:
   name: keystone-fernet-rotate
 spec:
   schedule: {{ .Values.jobs.fernet_rotate.cron | quote }}
+  successfulJobsHistoryLimit: {{ .Values.jobs.fernet_rotate.history.success }}
+  failedJobsHistoryLimit: {{ .Values.jobs.fernet_rotate.history.failed }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

keystone/values.yaml

@@ -247,6 +247,9 @@ jobs:
     cron: "0 0 * * 0"
     user: keystone
     group: keystone
+    history:
+      success: 3
+      failed: 1
   credential_setup:
     user: keystone
     group: keystone
@@ -256,6 +259,9 @@ jobs:
     migrate_wait: 120
     user: keystone
     group: keystone
+    history:
+      success: 3
+      failed: 1
 
 conf:
   keystone: