From b78ab3515e85bb391e6cadc3374da7ac1992db1f Mon Sep 17 00:00:00 2001 From: d-kuro Date: Fri, 28 Feb 2020 14:28:27 +0900 Subject: [PATCH 1/2] Fix ownerReferences.apiVersion for kubectl create job --from=cronjob --- staging/src/k8s.io/kubectl/pkg/cmd/create/create_job.go | 3 +-- staging/src/k8s.io/kubectl/pkg/cmd/create/create_job_test.go | 3 +-- 2 files changed, 2 insertions(+), 4 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 a295b6a0976..364b9a2a370 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 @@ -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, 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 585d4529814..df2df9ddeb9 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 @@ -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{ From a433e2d54582e3bd343eb90dccb395b2e6a74df8 Mon Sep 17 00:00:00 2001 From: d-kuro Date: Fri, 6 Mar 2020 12:31:46 +0900 Subject: [PATCH 2/2] Remove bazel deps package https://prow.k8s.io/view/gcs/kubernetes-jenkins/pr-logs/pull/88646/pull-kubernetes-verify/1235744517118758914 --- staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD | 2 -- 1 file changed, 2 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD index 127d3e47b15..99f6ff2da4e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD @@ -24,7 +24,6 @@ go_library( importpath = "k8s.io/kubectl/pkg/cmd/create", visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"], deps = [ - "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -80,7 +79,6 @@ go_test( data = ["//staging/src/k8s.io/kubectl/testdata"], embed = [":go_default_library"], deps = [ - "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",