From a4576ec5a663951b9f92b056737c165c44234727 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Tue, 23 Apr 2019 09:27:56 -0400 Subject: [PATCH] Fix binding and eviction admission --- pkg/registry/core/pod/storage/eviction.go | 7 +++ pkg/registry/core/pod/storage/storage.go | 6 ++ .../apiserver/admissionwebhook/BUILD | 1 + .../admissionwebhook/admission_test.go | 63 +++++++++++++++++-- 4 files changed, 72 insertions(+), 5 deletions(-) diff --git a/pkg/registry/core/pod/storage/eviction.go b/pkg/registry/core/pod/storage/eviction.go index 77d2b3c5bc9..1baab623a85 100644 --- a/pkg/registry/core/pod/storage/eviction.go +++ b/pkg/registry/core/pod/storage/eviction.go @@ -87,6 +87,13 @@ func (r *EvictionREST) Create(ctx context.Context, obj runtime.Object, createVal return nil, err } pod := obj.(*api.Pod) + + if createValidation != nil { + if err := createValidation(eviction); err != nil { + return nil, err + } + } + // Evicting a terminal pod should result in direct deletion of pod as it already caused disruption by the time we are evicting. // There is no need to check for pdb. if pod.Status.Phase == api.PodSucceeded || pod.Status.Phase == api.PodFailed { diff --git a/pkg/registry/core/pod/storage/storage.go b/pkg/registry/core/pod/storage/storage.go index 1a1fa9bbeb5..b3cdd393fb0 100644 --- a/pkg/registry/core/pod/storage/storage.go +++ b/pkg/registry/core/pod/storage/storage.go @@ -149,6 +149,12 @@ func (r *BindingREST) Create(ctx context.Context, obj runtime.Object, createVali return nil, errs.ToAggregate() } + if createValidation != nil { + if err := createValidation(binding); err != nil { + return nil, err + } + } + err = r.assignPod(ctx, binding.Name, binding.Target.Name, binding.Annotations, dryrun.IsDryRun(options.DryRun)) out = &metav1.Status{Status: metav1.StatusSuccess} return diff --git a/test/integration/apiserver/admissionwebhook/BUILD b/test/integration/apiserver/admissionwebhook/BUILD index 226908f4068..d4e63321439 100644 --- a/test/integration/apiserver/admissionwebhook/BUILD +++ b/test/integration/apiserver/admissionwebhook/BUILD @@ -17,6 +17,7 @@ go_test( "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", + "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", diff --git a/test/integration/apiserver/admissionwebhook/admission_test.go b/test/integration/apiserver/admissionwebhook/admission_test.go index 30ff9d9da5a..ec9647da32e 100644 --- a/test/integration/apiserver/admissionwebhook/admission_test.go +++ b/test/integration/apiserver/admissionwebhook/admission_test.go @@ -33,8 +33,10 @@ import ( "k8s.io/api/admission/v1beta1" admissionv1beta1 "k8s.io/api/admissionregistration/v1beta1" appsv1beta1 "k8s.io/api/apps/v1beta1" + corev1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" + policyv1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -102,6 +104,10 @@ var ( gvr("", "v1", "pods/exec"): {"create": testPodConnectSubresource}, gvr("", "v1", "pods/portforward"): {"create": testPodConnectSubresource}, + gvr("", "v1", "bindings"): {"create": testPodBindingEviction}, + gvr("", "v1", "pods/binding"): {"create": testPodBindingEviction}, + gvr("", "v1", "pods/eviction"): {"create": testPodBindingEviction}, + gvr("", "v1", "nodes/proxy"): {"*": testSubresourceProxy}, gvr("", "v1", "pods/proxy"): {"*": testSubresourceProxy}, gvr("", "v1", "services/proxy"): {"*": testSubresourceProxy}, @@ -124,11 +130,6 @@ var ( // TODO: webhook config objects are not subject to admission, verify CRUD works and webhooks do not observe them gvr("admissionregistration.k8s.io", "v1beta1", "mutatingwebhookconfigurations"): sets.NewString("*"), gvr("admissionregistration.k8s.io", "v1beta1", "validatingwebhookconfigurations"): sets.NewString("*"), - - // TODO: implement custom subresource tests (requires special states or requests) - gvr("", "v1", "bindings"): sets.NewString("create"), - gvr("", "v1", "pods/binding"): sets.NewString("create"), - gvr("", "v1", "pods/eviction"): sets.NewString("create"), } parentResources = map[schema.GroupVersionResource]schema.GroupVersionResource{ @@ -778,6 +779,58 @@ func testPodConnectSubresource(c *testContext) { } } +// testPodBindingEviction verifies pod binding and eviction admission +func testPodBindingEviction(c *testContext) { + podGVR := gvr("", "v1", "pods") + pod, err := createOrGetResource(c.client, podGVR, c.resources[podGVR]) + if err != nil { + c.t.Error(err) + return + } + + background := metav1.DeletePropagationBackground + zero := int64(0) + forceDelete := &metav1.DeleteOptions{GracePeriodSeconds: &zero, PropagationPolicy: &background} + defer func() { + err := c.clientset.CoreV1().Pods(pod.GetNamespace()).Delete(pod.GetName(), forceDelete) + if err != nil && !errors.IsNotFound(err) { + c.t.Error(err) + return + } + }() + + c.admissionHolder.expect(c.gvr, gvk(c.resource.Group, c.resource.Version, c.resource.Kind), v1beta1.Create, pod.GetName(), pod.GetNamespace(), true, false) + + switch c.gvr { + case gvr("", "v1", "bindings"): + err = c.clientset.CoreV1().RESTClient().Post().Namespace(pod.GetNamespace()).Resource("bindings").Body(&corev1.Binding{ + ObjectMeta: metav1.ObjectMeta{Name: pod.GetName()}, + Target: corev1.ObjectReference{Name: "foo", Kind: "Node", APIVersion: "v1"}, + }).Do().Error() + + case gvr("", "v1", "pods/binding"): + err = c.clientset.CoreV1().RESTClient().Post().Namespace(pod.GetNamespace()).Resource("pods").Name(pod.GetName()).SubResource("binding").Body(&corev1.Binding{ + ObjectMeta: metav1.ObjectMeta{Name: pod.GetName()}, + Target: corev1.ObjectReference{Name: "foo", Kind: "Node", APIVersion: "v1"}, + }).Do().Error() + + case gvr("", "v1", "pods/eviction"): + err = c.clientset.CoreV1().RESTClient().Post().Namespace(pod.GetNamespace()).Resource("pods").Name(pod.GetName()).SubResource("eviction").Body(&policyv1beta1.Eviction{ + ObjectMeta: metav1.ObjectMeta{Name: pod.GetName()}, + DeleteOptions: forceDelete, + }).Do().Error() + + default: + c.t.Errorf("unhandled resource %#v", c.gvr) + return + } + + if err != nil { + c.t.Error(err) + return + } +} + // testSubresourceProxy verifies proxy subresources func testSubresourceProxy(c *testContext) { parentGVR := getParentGVR(c.gvr)