github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37997 from foxish/dawn_pr 

Automatic merge from submit-queue (batch tested with PRs 37997, 37939, 37990, 36700, 37258)

Revert "Skip StatefulSet e2e tests if this resource is not found"

Replaces https://github.com/kubernetes/kubernetes/pull/37398
pull/6/head
Kubernetes Submit Queue 2016-12-02 19:26:46 -08:00 committed by GitHub
parent 1b2a4b55bb 9a9f7ec81d
commit e0803d4882
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/network_partition.go
View File

@ -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)

8
test/e2e/petset.go
View File

@ -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)