From f2a64cb91d7cf7216db60c2e1c8b1e530c85f94f Mon Sep 17 00:00:00 2001 From: carlory Date: Wed, 7 Jun 2023 19:01:51 +0800 Subject: [PATCH] fix Cronjob status.lastSuccessfulTime not populated by a manually triggered job --- .../k8s.io/kubectl/pkg/cmd/create/create_job.go | 15 ++++----------- .../kubectl/pkg/cmd/create/create_job_test.go | 13 +++---------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go index 6823276af7d..93ba136d020 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go @@ -261,17 +261,10 @@ func (o *CreateJobOptions) createJobFromCronJob(cronJob *batchv1.CronJob) *batch // this is ok because we know exactly how we want to be serialized TypeMeta: metav1.TypeMeta{APIVersion: batchv1.SchemeGroupVersion.String(), Kind: "Job"}, ObjectMeta: metav1.ObjectMeta{ - Name: o.Name, - Annotations: annotations, - Labels: cronJob.Spec.JobTemplate.Labels, - OwnerReferences: []metav1.OwnerReference{ - { - APIVersion: batchv1.SchemeGroupVersion.String(), - Kind: "CronJob", - Name: cronJob.GetName(), - UID: cronJob.GetUID(), - }, - }, + Name: o.Name, + Annotations: annotations, + Labels: cronJob.Spec.JobTemplate.Labels, + OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(cronJob, batchv1.SchemeGroupVersion.WithKind("CronJob"))}, }, Spec: cronJob.Spec.JobTemplate.Spec, } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go index fca7c87c319..facab5bd1e8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go @@ -161,16 +161,9 @@ func TestCreateJobFromCronJob(t *testing.T) { expected: &batchv1.Job{ TypeMeta: metav1.TypeMeta{APIVersion: batchv1.SchemeGroupVersion.String(), Kind: "Job"}, ObjectMeta: metav1.ObjectMeta{ - Name: jobName, - Annotations: map[string]string{"cronjob.kubernetes.io/instantiate": "manual"}, - OwnerReferences: []metav1.OwnerReference{ - { - APIVersion: batchv1.SchemeGroupVersion.String(), - Kind: "CronJob", - Name: cronJob.GetName(), - UID: cronJob.GetUID(), - }, - }, + Name: jobName, + Annotations: map[string]string{"cronjob.kubernetes.io/instantiate": "manual"}, + OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(cronJob, batchv1.SchemeGroupVersion.WithKind("CronJob"))}, }, Spec: batchv1.JobSpec{ Template: corev1.PodTemplateSpec{