From 1fe05ac29a0e3a67d58a80d26c77829e90bb6073 Mon Sep 17 00:00:00 2001 From: supereagle Date: Thu, 23 Nov 2017 09:32:13 +0800 Subject: [PATCH] Use batch client with explicit version --- pkg/kubectl/cmd/drain.go | 2 +- test/e2e/apimachinery/garbage_collector.go | 4 ++-- test/e2e/storage/persistent_volumes-local.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index 910654f6f6a..7249a521b26 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -335,7 +335,7 @@ func (o *DrainOptions) getController(namespace string, controllerRef *metav1.Own case "DaemonSet": return o.client.Extensions().DaemonSets(namespace).Get(controllerRef.Name, metav1.GetOptions{}) case "Job": - return o.client.Batch().Jobs(namespace).Get(controllerRef.Name, metav1.GetOptions{}) + return o.client.BatchV1().Jobs(namespace).Get(controllerRef.Name, metav1.GetOptions{}) case "ReplicaSet": return o.client.Extensions().ReplicaSets(namespace).Get(controllerRef.Name, metav1.GetOptions{}) case "StatefulSet": diff --git a/test/e2e/apimachinery/garbage_collector.go b/test/e2e/apimachinery/garbage_collector.go index e52ca37348b..4de503dba30 100644 --- a/test/e2e/apimachinery/garbage_collector.go +++ b/test/e2e/apimachinery/garbage_collector.go @@ -255,7 +255,7 @@ func verifyRemainingCronJobsJobsPods(f *framework.Framework, clientSet clientset By(fmt.Sprintf("expected %d cronjobs, got %d cronjobs", cjNum, len(cronJobs.Items))) } - jobs, err := f.ClientSet.Batch().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) + jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) if err != nil { return false, fmt.Errorf("Failed to list jobs: %v", err) } @@ -974,7 +974,7 @@ var _ = SIGDescribe("Garbage collector", func() { By("Wait for the CronJob to create new Job") err = wait.PollImmediate(500*time.Millisecond, 2*time.Minute, func() (bool, error) { - jobs, err := f.ClientSet.Batch().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) + jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) if err != nil { return false, fmt.Errorf("Failed to list jobs: %v", err) } diff --git a/test/e2e/storage/persistent_volumes-local.go b/test/e2e/storage/persistent_volumes-local.go index 5dd4cba67d9..9985b766a5e 100644 --- a/test/e2e/storage/persistent_volumes-local.go +++ b/test/e2e/storage/persistent_volumes-local.go @@ -1000,7 +1000,7 @@ func createBootstrapperJob(config *localTestConfig) { }, }, } - job, err := config.client.Batch().Jobs(config.ns).Create(bootJob) + job, err := config.client.BatchV1().Jobs(config.ns).Create(bootJob) Expect(err).NotTo(HaveOccurred()) err = framework.WaitForJobFinish(config.client, config.ns, job.Name, 1) Expect(err).NotTo(HaveOccurred())