github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 06:02:18 +00:00
Code Issues Projects Releases Wiki Activity

use policy client with explicit version

Browse Source
This commit is contained in:
supereagle
2017-11-27 22:42:00 +08:00
parent 02a7c12cbd
commit 79352bafaa
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/drain.go
View File

@@ -518,7 +518,7 @@ func (o *DrainOptions) evictPod(pod corev1.Pod, policyGroupVersion string) error
DeleteOptions: deleteOptions, DeleteOptions: deleteOptions,
} }
// Remember to change change the URL manipulation func when Evction's version change // 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 // deleteOrEvictPods deletes or evicts the pods on the api server

6
test/e2e/apps/disruption.go
View File

@@ -64,7 +64,7 @@ var _ = SIGDescribe("DisruptionController", func() {
// Since disruptionAllowed starts out 0, if we see it ever become positive, // Since disruptionAllowed starts out 0, if we see it ever become positive,
// that means the controller is working. // that means the controller is working.
err := wait.PollImmediate(framework.Poll, timeout, func() (bool, error) { 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 { if err != nil {
return false, err return false, err
} }
@@ -226,7 +226,7 @@ func createPDBMinAvailableOrDie(cs kubernetes.Interface, ns string, minAvailable
MinAvailable: &minAvailable, MinAvailable: &minAvailable,
}, },
} }
_, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb) _, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).Create(&pdb)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }
@@ -241,7 +241,7 @@ func createPDBMaxUnavailableOrDie(cs kubernetes.Interface, ns string, maxUnavail
MaxUnavailable: &maxUnavailable, MaxUnavailable: &maxUnavailable,
}, },
} }
_, err := cs.Policy().PodDisruptionBudgets(ns).Create(&pdb) _, err := cs.PolicyV1beta1().PodDisruptionBudgets(ns).Create(&pdb)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
} }

8
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@@ -964,10 +964,10 @@ func runDrainTest(f *framework.Framework, migSizes map[string]int, namespace str
MinAvailable: &minAvailable, MinAvailable: &minAvailable,
}, },
} }
_, err = f.ClientSet.Policy().PodDisruptionBudgets(namespace).Create(pdb) _, err = f.ClientSet.PolicyV1beta1().PodDisruptionBudgets(namespace).Create(pdb)
defer func() { 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) framework.ExpectNoError(err)
@@ -1904,7 +1904,7 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) {
var finalErr error var finalErr error
for _, newPdbName := range newPdbs { for _, newPdbName := range newPdbs {
By(fmt.Sprintf("Delete PodDisruptionBudget %v", newPdbName)) 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 { if err != nil {
// log error, but attempt to remove other pdbs // log error, but attempt to remove other pdbs
glog.Errorf("Failed to delete PodDisruptionBudget %v, err: %v", newPdbName, err) glog.Errorf("Failed to delete PodDisruptionBudget %v, err: %v", newPdbName, err)
@@ -1942,7 +1942,7 @@ func addKubeSystemPdbs(f *framework.Framework) (func(), error) {
MinAvailable: &minAvailable, MinAvailable: &minAvailable,
}, },
} }
_, err := f.ClientSet.Policy().PodDisruptionBudgets("kube-system").Create(pdb) _, err := f.ClientSet.PolicyV1beta1().PodDisruptionBudgets("kube-system").Create(pdb)
newPdbs = append(newPdbs, pdbName) newPdbs = append(newPdbs, pdbName)
if err != nil { if err != nil {