Skip to content

Commit b1a068b

Browse files
committed
Set appropriate owner references when creating a job from cronjob
1 parent 61f0036 commit b1a068b

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,12 @@ func (o *CreateJobOptions) createJobFromCronJob(cronJob *batchv1beta1.CronJob) *
256256
Annotations: annotations,
257257
Labels: cronJob.Spec.JobTemplate.Labels,
258258
OwnerReferences: []metav1.OwnerReference{
259-
*metav1.NewControllerRef(cronJob, cronJob.GroupVersionKind()),
259+
{
260+
APIVersion: batchv1beta1.SchemeGroupVersion.String(),
261+
Kind: cronJob.Kind,
262+
Name: cronJob.GetName(),
263+
UID: cronJob.GetUID(),
264+
},
260265
},
261266
},
262267
Spec: cronJob.Spec.JobTemplate.Spec,

staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,16 @@ func TestCreateJobFromCronJob(t *testing.T) {
162162
expected: &batchv1.Job{
163163
TypeMeta: metav1.TypeMeta{APIVersion: batchv1.SchemeGroupVersion.String(), Kind: "Job"},
164164
ObjectMeta: metav1.ObjectMeta{
165-
Name: jobName,
166-
Annotations: map[string]string{"cronjob.kubernetes.io/instantiate": "manual"},
167-
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(cronJob, cronJob.GroupVersionKind())},
165+
Name: jobName,
166+
Annotations: map[string]string{"cronjob.kubernetes.io/instantiate": "manual"},
167+
OwnerReferences: []metav1.OwnerReference{
168+
{
169+
APIVersion: batchv1beta1.SchemeGroupVersion.String(),
170+
Kind: cronJob.Kind,
171+
Name: cronJob.GetName(),
172+
UID: cronJob.GetUID(),
173+
},
174+
},
168175
},
169176
Spec: batchv1.JobSpec{
170177
Template: corev1.PodTemplateSpec{

0 commit comments

Comments
 (0)