diff --git a/pkg/kubectl/cmd/drain.go b/pkg/kubectl/cmd/drain.go index 910654f6f6a..eb968010791 100644 --- a/pkg/kubectl/cmd/drain.go +++ b/pkg/kubectl/cmd/drain.go @@ -518,7 +518,7 @@ func (o *DrainOptions) evictPod(pod corev1.Pod, policyGroupVersion string) error DeleteOptions: deleteOptions, } // Remember to change change the URL manipulation func when Evction's version change - return o.client.Policy().Evictions(eviction.Namespace).Evict(eviction) + return o.client.PolicyV1beta1().Evictions(eviction.Namespace).Evict(eviction) } // deleteOrEvictPods deletes or evicts the pods on the api server diff --git a/test/e2e/apps/disruption.go b/test/e2e/apps/disruption.go index f86f83cb434..ac39720d90b 100644 --- a/test/e2e/apps/disruption.go +++ b/test/e2e/apps/disruption.go @@ -64,7 +64,7 @@ var _ = SIGDescribe("DisruptionController", func() { // Since disruptionAllowed starts out 0, if we see it ever become positive, // that means the controller is working. err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { - pdb, err := cs.Policy().PodDisruptionBudgets(ns).Get("foo", metav1.GetOptions{}) + pdb, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).Get("foo", metav1.GetOptions{}) if err != nil { return false, err } @@ -226,7 +226,7 @@ func createPDBMinAvailableOrDie(cs kubernetes.Interface, ns string, minAvailable MinAvailable: &minAvailable, }, } - _, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb) + _, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).Create(&pdb) Expect(err).NotTo(HaveOccurred()) } @@ -241,7 +241,7 @@ func createPDBMaxUnavailableOrDie(cs kubernetes.Interface, ns string, maxUnavail MaxUnavailable: &maxUnavailable, }, } - _, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb) + _, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).Create(&pdb) Expect(err).NotTo(HaveOccurred()) } diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index 0d5f60dc919..3eb2ccd8ace 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -964,10 +964,10 @@ func runDrainTest(f *framework.Framework, migSizes map[string]int, namespace str MinAvailable: &minAvailable, }, } - _, err = f.ClientSet.Policy().PodDisruptionBudgets(namespace).Create(pdb) + _, err = f.ClientSet.PolicyV1beta1().PodDisruptionBudgets(namespace).Create(pdb) defer func() { - f.ClientSet.Policy().PodDisruptionBudgets(namespace).Delete(pdb.Name, &metav1.DeleteOptions{}) + f.ClientSet.PolicyV1beta1().PodDisruptionBudgets(namespace).Delete(pdb.Name, &metav1.DeleteOptions{}) }() framework.ExpectNoError(err) @@ -1904,7 +1904,7 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) { var finalErr error for _, newPdbName := range newPdbs { By(fmt.Sprintf("Delete PodDisruptionBudget %v", newPdbName)) - err := f.ClientSet.Policy().PodDisruptionBudgets("kube-system").Delete(newPdbName, &metav1.DeleteOptions{}) + err := f.ClientSet.PolicyV1beta1().PodDisruptionBudgets("kube-system").Delete(newPdbName, &metav1.DeleteOptions{}) if err != nil { // log error, but attempt to remove other pdbs glog.Errorf("Failed to delete PodDisruptionBudget %v, err: %v", newPdbName, err) @@ -1942,7 +1942,7 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) { MinAvailable: &minAvailable, }, } - _, err := f.ClientSet.Policy().PodDisruptionBudgets("kube-system").Create(pdb) + _, err := f.ClientSet.PolicyV1beta1().PodDisruptionBudgets("kube-system").Create(pdb) newPdbs = append(newPdbs, pdbName) if err != nil {