Merge "Add startingDeadlineSeconds field to cronJobs"

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

@@ -33,6 +33,9 @@ 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 }}
+  {{- if .Values.jobs.volume_usage_audit.starting_deadline }}
+  startingDeadlineSeconds: {{ .Values.jobs.volume_usage_audit.starting_deadline }}
+  {{- end }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

cinder/values.yaml

@@ -71,6 +71,7 @@ images:
 jobs:
   volume_usage_audit:
     cron: "*/5 * * * *"
+    starting_deadline: 600
     history:
       success: 3
       failed: 1

heat/templates/cron-job-engine-cleaner.yaml

@@ -33,6 +33,9 @@ spec:
   schedule: {{ .Values.jobs.engine_cleaner.cron | quote }}
   successfulJobsHistoryLimit: {{ .Values.jobs.engine_cleaner.history.success }}
   failedJobsHistoryLimit: {{ .Values.jobs.engine_cleaner.history.failed }}
+  {{- if .Values.jobs.engine_cleaner.starting_deadline }}
+  startingDeadlineSeconds: {{ .Values.jobs.engine_cleaner.starting_deadline }}
+  {{- end }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

heat/values.yaml

@@ -67,6 +67,7 @@ images:
 jobs:
   engine_cleaner:
     cron: "*/5 * * * *"
+    starting_deadline: 600
     history:
       success: 3
       failed: 1

nova/templates/cron-job-cell-setup.yaml

@@ -30,6 +30,9 @@ spec:
   schedule: {{ .Values.jobs.cell_setup.cron | quote }}
   successfulJobsHistoryLimit: {{ .Values.jobs.cell_setup.history.success }}
   failedJobsHistoryLimit: {{ .Values.jobs.cell_setup.history.failed }}
+  {{- if .Values.jobs.cell_setup.starting_deadline }}
+  startingDeadlineSeconds: {{ .Values.jobs.cell_setup.starting_deadline }}
+  {{- end }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

nova/templates/cron-job-service-cleaner.yaml

@@ -30,6 +30,9 @@ spec:
   schedule: {{ .Values.jobs.service_cleaner.cron | quote }}
   successfulJobsHistoryLimit: {{ .Values.jobs.service_cleaner.history.success }}
   failedJobsHistoryLimit: {{ .Values.jobs.service_cleaner.history.failed }}
+  {{- if .Values.jobs.service_cleaner.starting_deadline }}
+  startingDeadlineSeconds: {{ .Values.jobs.service_cleaner.starting_deadline }}
+  {{- end }}
   concurrencyPolicy: Forbid
   jobTemplate:
     metadata:

nova/values.yaml

@@ -100,11 +100,13 @@ jobs:
   # TODO(portdirect): Add a post-start action to nova compute pods that registers themselves.
   cell_setup:
     cron: "0 */1 * * *"
+    starting_deadline: 600
     history:
       success: 3
       failed: 1
   service_cleaner:
     cron: "0 */1 * * *"
+    starting_deadline: 600
     history:
       success: 3
       failed: 1