mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #93327 from aojea/dnsipv6
e2e dns test autodetect the IP family
This commit is contained in:
commit
debcc37798
@ -26,7 +26,6 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
|
e2eservice "k8s.io/kubernetes/test/e2e/framework/service"
|
||||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
)
|
)
|
||||||
@ -484,14 +483,14 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
|
|||||||
t.restoreDNSConfigMap(originalConfigMapData)
|
t.restoreDNSConfigMap(originalConfigMapData)
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ = SIGDescribe("DNS configMap nameserver [IPv4]", func() {
|
var _ = SIGDescribe("DNS configMap nameserver", func() {
|
||||||
|
|
||||||
ginkgo.Context("Change stubDomain", func() {
|
ginkgo.Context("Change stubDomain", func() {
|
||||||
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}
|
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}
|
||||||
|
|
||||||
ginkgo.It("should be able to change stubDomain configuration [Slow][Serial]", func() {
|
ginkgo.It("should be able to change stubDomain configuration [Slow][Serial]", func() {
|
||||||
nsTest.c = nsTest.f.ClientSet
|
nsTest.c = nsTest.f.ClientSet
|
||||||
nsTest.run(false)
|
nsTest.run(framework.TestContext.ClusterIsIPv6())
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -500,7 +499,7 @@ var _ = SIGDescribe("DNS configMap nameserver [IPv4]", func() {
|
|||||||
|
|
||||||
ginkgo.It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
|
ginkgo.It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
|
||||||
fwdTest.c = fwdTest.f.ClientSet
|
fwdTest.c = fwdTest.f.ClientSet
|
||||||
fwdTest.run(false)
|
fwdTest.run(framework.TestContext.ClusterIsIPv6())
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -509,42 +508,7 @@ var _ = SIGDescribe("DNS configMap nameserver [IPv4]", func() {
|
|||||||
|
|
||||||
ginkgo.It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
|
ginkgo.It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
|
||||||
externalNameTest.c = externalNameTest.f.ClientSet
|
externalNameTest.c = externalNameTest.f.ClientSet
|
||||||
externalNameTest.run(false)
|
externalNameTest.run(framework.TestContext.ClusterIsIPv6())
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
var _ = SIGDescribe("DNS configMap nameserver [Feature:Networking-IPv6] [LinuxOnly]", func() {
|
|
||||||
|
|
||||||
ginkgo.BeforeEach(func() {
|
|
||||||
// IPv6 is not supported on Windows.
|
|
||||||
e2eskipper.SkipIfNodeOSDistroIs("windows")
|
|
||||||
})
|
|
||||||
|
|
||||||
ginkgo.Context("Change stubDomain", func() {
|
|
||||||
nsTest := &dnsNameserverTest{dnsTestCommon: newDNSTestCommon()}
|
|
||||||
|
|
||||||
ginkgo.It("should be able to change stubDomain configuration [Slow][Serial]", func() {
|
|
||||||
nsTest.c = nsTest.f.ClientSet
|
|
||||||
nsTest.run(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
ginkgo.Context("Forward PTR lookup", func() {
|
|
||||||
fwdTest := &dnsPtrFwdTest{dnsTestCommon: newDNSTestCommon()}
|
|
||||||
|
|
||||||
ginkgo.It("should forward PTR records lookup to upstream nameserver [Slow][Serial]", func() {
|
|
||||||
fwdTest.c = fwdTest.f.ClientSet
|
|
||||||
fwdTest.run(true)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
ginkgo.Context("Forward external name lookup", func() {
|
|
||||||
externalNameTest := &dnsExternalNameTest{dnsTestCommon: newDNSTestCommon()}
|
|
||||||
|
|
||||||
ginkgo.It("should forward externalname lookup to upstream nameserver [Slow][Serial]", func() {
|
|
||||||
externalNameTest.c = externalNameTest.f.ClientSet
|
|
||||||
externalNameTest.run(true)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user