Merge pull request #794 from hzxuzhonghu/automated-cherry-pick-of-#78…

…6-origin-release-0.4 Automated cherry pick of #786: Fix Job crd definition to support job patch
volcano-sh · May 8, 2020 · 2275754 · 2275754
2 parents c5c2534 + 01ad8b5
commit 2275754
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/installer/helm/chart/volcano/templates/batch_v1alpha1_job.yaml b/installer/helm/chart/volcano/templates/batch_v1alpha1_job.yaml
@@ -184,6 +184,10 @@ spec:
                   description: Unique, one-word, CamelCase reason for the condition's
                     last transition.
                   type: string
+                lastTransitionTime:
+                  description: The time of last state transition.
+                  format: date-time
+                  type: string
               type: object
           type: object
   version: v1alpha1

diff --git a/installer/volcano-development.yaml b/installer/volcano-development.yaml
@@ -559,6 +559,10 @@ spec:
                   description: Unique, one-word, CamelCase reason for the condition's
                     last transition.
                   type: string
+                lastTransitionTime:
+                  description: The time of last state transition.
+                  format: date-time
+                  type: string
               type: object
           type: object
   version: v1alpha1

diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go
@@ -543,6 +543,7 @@ func (cc *Controller) initJobStatus(job *batch.Job) (*batch.Job, error) {
 	}
 
 	job.Status.State.Phase = batch.Pending
+	job.Status.State.LastTransitionTime = metav1.Now()
 	job.Status.MinAvailable = job.Spec.MinAvailable
 	newJob, err := cc.vcClient.BatchV1alpha1().Jobs(job.Namespace).UpdateStatus(job)
 	if err != nil {