github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix ownerReferences.apiVersion for kubectl create job --from=cronjob

Browse Source
This commit is contained in:
d-kuro 2020-02-28 14:28:27 +09:00
parent edf460bc0f
commit b78ab3515e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@ import (
"github.com/spf13/cobra"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
corev1 "k8s.io/api/core/v1"
@ -259,7 +258,7 @@ func (o *CreateJobOptions) createJobFromCronJob(cronJob *batchv1beta1.CronJob) *
Annotations: annotations,
Labels: cronJob.Spec.JobTemplate.Labels,
OwnerReferences: []metav1.OwnerReference{
*metav1.NewControllerRef(cronJob, appsv1.SchemeGroupVersion.WithKind("CronJob")),
*metav1.NewControllerRef(cronJob, cronJob.GroupVersionKind()),
},
},
Spec: cronJob.Spec.JobTemplate.Spec,

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

@ -20,7 +20,6 @@ import (
"strings"
"testing"
apps "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
corev1 "k8s.io/api/core/v1"
@ -165,7 +164,7 @@ func TestCreateJobFromCronJob(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: jobName,
Annotations: map[string]string{"cronjob.kubernetes.io/instantiate": "manual"},
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(cronJob, apps.SchemeGroupVersion.WithKind("CronJob"))},
OwnerReferences: []metav1.OwnerReference{*metav1.NewControllerRef(cronJob, cronJob.GroupVersionKind())},
},
Spec: batchv1.JobSpec{
Template: corev1.PodTemplateSpec{