github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93427 from liggitt/default-ingress-class

Browse Source 
Mark default ingressclass tests serial, do not set default ingressclass in conformance
This commit is contained in:
Kubernetes Prow Robot 2020-07-24 14:26:30 -07:00 committed by GitHub
commit c0a4d4b0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/network/ingressclass.go
View File

@ -43,7 +43,7 @@ var _ = SIGDescribe("IngressClass [Feature:Ingress]", func() {
cs = f.ClientSet 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) ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name) defer deleteIngressClass(cs, ingressClass1.Name)
@ -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) ingressClass1, err := createIngressClass(cs, "ingressclass1", false, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name) defer deleteIngressClass(cs, ingressClass1.Name)
@ -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) ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
defer deleteIngressClass(cs, ingressClass1.Name) defer deleteIngressClass(cs, ingressClass1.Name)
@ -212,11 +212,11 @@ var _ = SIGDescribe("IngressClass API", func() {
// IngressClass resource create/read/update/watch verbs // IngressClass resource create/read/update/watch verbs
ginkgo.By("creating") ginkgo.By("creating")
ingressClass1, err := createIngressClass(cs, "ingressclass1", true, f.UniqueName) ingressClass1, err := createIngressClass(cs, "ingressclass1", false, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
_, err = createIngressClass(cs, "ingressclass2", true, f.UniqueName) _, err = createIngressClass(cs, "ingressclass2", false, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
_, err = createIngressClass(cs, "ingressclass3", true, f.UniqueName) _, err = createIngressClass(cs, "ingressclass3", false, f.UniqueName)
framework.ExpectNoError(err) framework.ExpectNoError(err)
ginkgo.By("getting") ginkgo.By("getting")