Merge pull request #37389 from janetkuo/statefulset-skip-gke

test/e2e/network_partition.go

@@ -367,6 +367,7 @@ 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)

test/e2e/petset.go

@@ -64,6 +64,10 @@ const (
 	readTimeout = 60 * time.Second
 )
 
+var (
+	StatefulSetGroupVersionResource = unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"}
+)
+
 // Time: 25m, slow by design.
 // GCE Quota requirements: 3 pds, one per pet manifest declared above.
 // GCE Api requirements: nodes and master need storage r/w permissions.
@@ -75,6 +79,7 @@ var _ = framework.KubeDescribe("StatefulSet [Slow]", func() {
 	BeforeEach(func() {
 		c = f.ClientSet
 		ns = f.Namespace.Name
+		framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name)
 	})
 
 	framework.KubeDescribe("Basic StatefulSet functionality", func() {
@@ -402,7 +407,7 @@ var _ = framework.KubeDescribe("Stateful Set recreate [Slow]", func() {
 	petPodName := "web-0"
 
 	BeforeEach(func() {
-		framework.SkipUnlessProviderIs("gce", "vagrant")
+		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)