Merge pull request #44044 from mikkeloscar/prestop-noauth

Automatic merge from submit-queue e2e: Remove special serviceaccount permission requirement **What this PR does / why we need it**: This removes the requirement for having a `default` serviceaccount with permission `create` `pod` in order to run the prestop e2e conformance test. The `create` `pod` permissions are not needed for this particular test, and having it effectively means that as cluster must have a `default` serviceaccount with `create` `pod` permissions in order to be conformant, which I don't think is desired. **Special notes for your reviewer**: **Release note**: ```release-note None ```

Merge pull request #44044 from mikkeloscar/prestop-noauth
63d4be02 · Kubernetes Submit Queue · GitHub · 13b7c95f · f39f2e29 · 63d4be02
Commit 63d4be02 authored Apr 28, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 15 deletions

pre_stop.go test/e2e/pre_stop.go +0 -15

No files found.
--- a/test/e2e/pre_stop.go
+++ b/test/e2e/pre_stop.go
@@ -23,11 +23,8 @@ import (
 	"time"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/kubernetes/pkg/api/v1"
-	rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/test/e2e/framework"
@@ -177,18 +174,6 @@ func testPreStop(c clientset.Interface, ns string) {
 var _ = framework.KubeDescribe("PreStop", func() {
 	f := framework.NewDefaultFramework("prestop")
-	BeforeEach(func() {
-		// this test wants extra permissions.  Since the namespace names are unique, we can leave this
-		// lying around so we don't have to race any caches
-		framework.BindClusterRole(f.ClientSet.Rbac(), "cluster-admin", f.Namespace.Name,
-			rbacv1beta1.Subject{Kind: rbacv1beta1.ServiceAccountKind, Namespace: f.Namespace.Name, Name: "default"})
-		err := framework.WaitForAuthorizationUpdate(f.ClientSet.AuthorizationV1beta1(),
-			serviceaccount.MakeUsername(f.Namespace.Name, "default"),
-			"", "create", schema.GroupResource{Resource: "pods"}, true)
-		framework.ExpectNoError(err)
-	})
 	It("should call prestop when killing a pod [Conformance]", func() {
 		testPreStop(f.ClientSet, f.Namespace.Name)
 	})