From 869adf8bd7e9ec7d8bba8317cb987d760d83833d Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Fri, 30 Nov 2018 15:14:04 +0100 Subject: [PATCH] client-go/testing: Straighten out fake implementation of Evictions Make Evictions the same between Policyv1beta1 and Corev1 --- .../policy/internalversion/fake/fake_eviction_expansion.go | 6 ++++-- .../kubernetes/typed/core/v1/fake/fake_pod_expansion.go | 1 + .../typed/policy/v1beta1/fake/fake_eviction_expansion.go | 7 ++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go index fae6df35061..a4d721876d4 100644 --- a/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go +++ b/pkg/client/clientset_generated/internalclientset/typed/policy/internalversion/fake/fake_eviction_expansion.go @@ -23,11 +23,13 @@ import ( ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { - action := core.GetActionImpl{} - action.Verb = "post" + action := core.CreateActionImpl{} + action.Verb = "create" action.Namespace = c.ns action.Resource = schema.GroupVersionResource{Group: "", Version: "", Resource: "pods"} action.Subresource = "eviction" + action.Object = eviction + _, err := c.Fake.Invokes(action, eviction) return err } diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go index 9c4b09d3e9f..b35d8aaa5fc 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go @@ -60,6 +60,7 @@ func (c *FakePods) GetLogs(name string, opts *v1.PodLogOptions) *restclient.Requ func (c *FakePods) Evict(eviction *policy.Eviction) error { action := core.CreateActionImpl{} action.Verb = "create" + action.Namespace = c.ns action.Resource = podsResource action.Subresource = "eviction" action.Object = eviction diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go index f3b5e93ab0d..d660d09e565 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go @@ -23,12 +23,13 @@ import ( ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { - action := core.GetActionImpl{} - action.Verb = "post" + action := core.CreateActionImpl{} + action.Verb = "create" action.Namespace = c.ns action.Resource = schema.GroupVersionResource{Group: "", Version: "v1", Resource: "pods"} action.Subresource = "eviction" - action.Name = eviction.Name + action.Object = eviction + _, err := c.Fake.Invokes(action, eviction) return err }