Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark default ingressclass tests serial, do not set default ingressclass in conformance #93427

Merged
merged 1 commit into from Jul 24, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/e2e/network/ingressclass.go
Expand Up @@ -43,7 +43,7 @@ var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
cs = f.ClientSet
})

ginkgo.It("should set default value on new IngressClass", func() {
ginkgo.It("should set default value on new IngressClass [Serial]", func() {
ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName)
framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name)
Expand All @@ -58,7 +58,7 @@ var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
}
})

ginkgo.It("should not set default value if no default IngressClass", func() {
ginkgo.It("should not set default value if no default IngressClass [Serial]", func() {
ingressClass1, err := createIngressClass(cs, "ingressclass1", false, f.UniqueName)
framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name)
Expand All @@ -71,7 +71,7 @@ var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
}
})

ginkgo.It("should prevent Ingress creation if more than 1 IngressClass marked as default", func() {
ginkgo.It("should prevent Ingress creation if more than 1 IngressClass marked as default [Serial]", func() {
ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName)
framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name)
Expand Down Expand Up @@ -212,11 +212,11 @@ var _ = SIGDescribe("IngressClass API", func() {

// IngressClass resource create/read/update/watch verbs
ginkgo.By("creating")
ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName)
ingressClass1, err := createIngressClass(cs, "ingressclass1", false, f.UniqueName)
framework.ExpectNoError(err)
_, err = createIngressClass(cs, "ingressclass2", true, f.UniqueName)
_, err = createIngressClass(cs, "ingressclass2", false, f.UniqueName)
framework.ExpectNoError(err)
_, err = createIngressClass(cs, "ingressclass3", true, f.UniqueName)
_, err = createIngressClass(cs, "ingressclass3", false, f.UniqueName)
framework.ExpectNoError(err)

ginkgo.By("getting")
Expand Down