From 03ad7d2d6ffe1cd537050bb0b82cfb74a6d06795 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Thu, 20 Jun 2019 11:40:01 -0700 Subject: [PATCH] add import-alias for k8s.io/api/batch/v1 --- hack/.import-aliases | 3 ++- test/e2e/auth/metadata_concealment.go | 6 +++--- test/e2e/framework/job/rest.go | 10 +++++----- test/e2e/framework/pod/runtimeobject.go | 6 +++--- test/e2e/framework/util.go | 6 +++--- test/e2e/node/ttlafterfinished.go | 6 +++--- test/e2e/upgrades/apps/job.go | 4 ++-- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/hack/.import-aliases b/hack/.import-aliases index bc059ee4e59..596878c95d1 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -9,5 +9,6 @@ "k8s.io/api/authentication/v1beta1": "authenticationv1beta1", "k8s.io/api/authorization/v1": "authorizationv1", "k8s.io/api/authorization/v1beta1": "authorizationv1beta1", - "k8s.io/api/autoscaling/v1": "autoscalingv1" + "k8s.io/api/autoscaling/v1": "autoscalingv1", + "k8s.io/api/batch/v1": "batchv1" } \ No newline at end of file diff --git a/test/e2e/auth/metadata_concealment.go b/test/e2e/auth/metadata_concealment.go index 5d9c3f70b5d..e768ff0349f 100644 --- a/test/e2e/auth/metadata_concealment.go +++ b/test/e2e/auth/metadata_concealment.go @@ -17,7 +17,7 @@ limitations under the License. package auth import ( - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" @@ -33,11 +33,11 @@ var _ = SIGDescribe("Metadata Concealment", func() { ginkgo.It("should run a check-metadata-concealment job to completion", func() { framework.SkipUnlessProviderIs("gce") ginkgo.By("Creating a job") - job := &batch.Job{ + job := &batchv1.Job{ ObjectMeta: metav1.ObjectMeta{ Name: "check-metadata-concealment", }, - Spec: batch.JobSpec{ + Spec: batchv1.JobSpec{ Template: v1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ Name: "check-metadata-concealment", diff --git a/test/e2e/framework/job/rest.go b/test/e2e/framework/job/rest.go index 374a7bced6c..842f4ba0338 100644 --- a/test/e2e/framework/job/rest.go +++ b/test/e2e/framework/job/rest.go @@ -19,7 +19,7 @@ package job import ( "fmt" - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -30,7 +30,7 @@ import ( ) // GetJob uses c to get the Job in namespace ns named name. If the returned error is nil, the returned Job is valid. -func GetJob(c clientset.Interface, ns, name string) (*batch.Job, error) { +func GetJob(c clientset.Interface, ns, name string) (*batchv1.Job, error) { return c.BatchV1().Jobs(ns).Get(name, metav1.GetOptions{}) } @@ -43,18 +43,18 @@ func GetJobPods(c clientset.Interface, ns, jobName string) (*v1.PodList, error) // CreateJob uses c to create job in namespace ns. If the returned error is nil, the returned Job is valid and has // been created. -func CreateJob(c clientset.Interface, ns string, job *batch.Job) (*batch.Job, error) { +func CreateJob(c clientset.Interface, ns string, job *batchv1.Job) (*batchv1.Job, error) { return c.BatchV1().Jobs(ns).Create(job) } // UpdateJob uses c to updated job in namespace ns. If the returned error is nil, the returned Job is valid and has // been updated. -func UpdateJob(c clientset.Interface, ns string, job *batch.Job) (*batch.Job, error) { +func UpdateJob(c clientset.Interface, ns string, job *batchv1.Job) (*batchv1.Job, error) { return c.BatchV1().Jobs(ns).Update(job) } // UpdateJobWithRetries updates job with retries. -func UpdateJobWithRetries(c clientset.Interface, namespace, name string, applyUpdate func(*batch.Job)) (job *batch.Job, err error) { +func UpdateJobWithRetries(c clientset.Interface, namespace, name string, applyUpdate func(*batchv1.Job)) (job *batchv1.Job, err error) { jobs := c.BatchV1().Jobs(namespace) var updateErr error pollErr := wait.PollImmediate(framework.Poll, JobTimeout, func() (bool, error) { diff --git a/test/e2e/framework/pod/runtimeobject.go b/test/e2e/framework/pod/runtimeobject.go index c3db1d86ec5..816f4c08b3b 100644 --- a/test/e2e/framework/pod/runtimeobject.go +++ b/test/e2e/framework/pod/runtimeobject.go @@ -20,7 +20,7 @@ import ( "fmt" appsv1 "k8s.io/api/apps/v1" - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" extensions "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -71,7 +71,7 @@ func getSelectorFromRuntimeObject(obj runtime.Object) (labels.Selector, error) { return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *batch.Job: + case *batchv1.Job: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) default: return nil, fmt.Errorf("Unsupported kind when getting selector: %v", obj) @@ -111,7 +111,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return 0, nil case *appsv1.DaemonSet: return 0, nil - case *batch.Job: + case *batchv1.Job: // TODO: currently we use pause pods so that's OK. When we'll want to switch to Pods // that actually finish we need a better way to do this. if typed.Spec.Parallelism != nil { diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 73ebebda5ac..adbf93ee427 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -48,7 +48,7 @@ import ( gomegatypes "github.com/onsi/gomega/types" appsv1 "k8s.io/api/apps/v1" - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" extensions "k8s.io/api/extensions/v1beta1" apierrs "k8s.io/apimachinery/pkg/api/errors" @@ -2259,7 +2259,7 @@ func getSelectorFromRuntimeObject(obj runtime.Object) (labels.Selector, error) { return metav1.LabelSelectorAsSelector(typed.Spec.Selector) case *appsv1.DaemonSet: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) - case *batch.Job: + case *batchv1.Job: return metav1.LabelSelectorAsSelector(typed.Spec.Selector) default: return nil, fmt.Errorf("Unsupported kind when getting selector: %v", obj) @@ -2297,7 +2297,7 @@ func getReplicasFromRuntimeObject(obj runtime.Object) (int32, error) { return 0, nil case *appsv1.DaemonSet: return 0, nil - case *batch.Job: + case *batchv1.Job: // TODO: currently we use pause pods so that's OK. When we'll want to switch to Pods // that actually finish we need a better way to do this. if typed.Spec.Parallelism != nil { diff --git a/test/e2e/node/ttlafterfinished.go b/test/e2e/node/ttlafterfinished.go index b35746ea1e4..a7e750538ac 100644 --- a/test/e2e/node/ttlafterfinished.go +++ b/test/e2e/node/ttlafterfinished.go @@ -19,7 +19,7 @@ package node import ( "time" - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/util/slice" @@ -41,12 +41,12 @@ var _ = framework.KubeDescribe("[Feature:TTLAfterFinished][NodeAlphaFeature:TTLA }) }) -func cleanupJob(f *framework.Framework, job *batch.Job) { +func cleanupJob(f *framework.Framework, job *batchv1.Job) { ns := f.Namespace.Name c := f.ClientSet e2elog.Logf("Remove the Job's dummy finalizer; the Job should be deleted cascadingly") - removeFinalizerFunc := func(j *batch.Job) { + removeFinalizerFunc := func(j *batchv1.Job) { j.ObjectMeta.Finalizers = slice.RemoveString(j.ObjectMeta.Finalizers, dummyFinalizer, nil) } _, err := jobutil.UpdateJobWithRetries(c, ns, job.Name, removeFinalizerFunc) diff --git a/test/e2e/upgrades/apps/job.go b/test/e2e/upgrades/apps/job.go index dc955003f02..515bee7aa82 100644 --- a/test/e2e/upgrades/apps/job.go +++ b/test/e2e/upgrades/apps/job.go @@ -17,7 +17,7 @@ limitations under the License. package upgrades import ( - batch "k8s.io/api/batch/v1" + batchv1 "k8s.io/api/batch/v1" "k8s.io/api/core/v1" "k8s.io/kubernetes/test/e2e/framework" jobutil "k8s.io/kubernetes/test/e2e/framework/job" @@ -28,7 +28,7 @@ import ( // JobUpgradeTest is a test harness for batch Jobs. type JobUpgradeTest struct { - job *batch.Job + job *batchv1.Job namespace string }