diff --git a/test/e2e/network_partition.go b/test/e2e/network_partition.go index a8b6c851001..c54a3fbf67b 100644 --- a/test/e2e/network_partition.go +++ b/test/e2e/network_partition.go @@ -368,7 +368,6 @@ var _ = framework.KubeDescribe("Network Partition [Disruptive] [Slow]", func() { BeforeEach(func() { framework.SkipUnlessProviderIs("gce", "gke") - framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) headlessService := createServiceSpec(headlessSvcName, "", true, labels) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService) diff --git a/test/e2e/petset.go b/test/e2e/petset.go index 8e85f8a5441..9e291a3547f 100644 --- a/test/e2e/petset.go +++ b/test/e2e/petset.go @@ -39,7 +39,6 @@ import ( "k8s.io/kubernetes/pkg/labels" klabels "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" - "k8s.io/kubernetes/pkg/runtime/schema" "k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/sets" @@ -66,10 +65,6 @@ const ( readTimeout = 60 * time.Second ) -var ( - StatefulSetGroupVersionResource = schema.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"} -) - // GCE Quota requirements: 3 pds, one per pet manifest declared above. // GCE Api requirements: nodes and master need storage r/w permissions. var _ = framework.KubeDescribe("StatefulSet", func() { @@ -80,7 +75,6 @@ var _ = framework.KubeDescribe("StatefulSet", func() { BeforeEach(func() { c = f.ClientSet ns = f.Namespace.Name - framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) }) framework.KubeDescribe("Basic StatefulSet functionality", func() { @@ -408,7 +402,7 @@ var _ = framework.KubeDescribe("Stateful Set recreate", func() { petPodName := "web-0" BeforeEach(func() { - framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) + framework.SkipUnlessProviderIs("gce", "gke", "vagrant") By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) headlessService := createServiceSpec(headlessSvcName, "", true, labels) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService)