github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74371 from rajansandeep/testhealthcheck

Browse Source 
Add health plugin for CoreDNS in the DNS tests
This commit is contained in:
Kubernetes Prow Robot 2019-02-21 16:27:43 -08:00 committed by GitHub
commit a07c73d098
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/e2e/network/dns_configmap.go
View File

@ -66,6 +66,7 @@ func (t *dnsFederationsConfigMapTest) run() {
t.labels = []string{"abc", "ghi"} t.labels = []string{"abc", "ghi"}
valid1 := map[string]string{ valid1 := map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -74,12 +75,13 @@ func (t *dnsFederationsConfigMapTest) run() {
federation %v { federation %v {
abc def.com abc def.com
} }
proxy . /etc/resolv.conf forward . /etc/resolv.conf
}`, framework.TestContext.ClusterDNSDomain, framework.TestContext.ClusterDNSDomain)} }`, framework.TestContext.ClusterDNSDomain, framework.TestContext.ClusterDNSDomain)}
valid1m := map[string]string{t.labels[0]: "def.com"} valid1m := map[string]string{t.labels[0]: "def.com"}
valid2 := map[string]string{ valid2 := map[string]string{
"Corefile": fmt.Sprintf(`:53 { "Corefile": fmt.Sprintf(`:53 {
health
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
@ -88,7 +90,7 @@ func (t *dnsFederationsConfigMapTest) run() {
federation %v { federation %v {
ghi xyz.com ghi xyz.com
} }
proxy . /etc/resolv.conf forward . /etc/resolv.conf
}`, framework.TestContext.ClusterDNSDomain, framework.TestContext.ClusterDNSDomain)} }`, framework.TestContext.ClusterDNSDomain, framework.TestContext.ClusterDNSDomain)}
valid2m := map[string]string{t.labels[1]: "xyz.com"} valid2m := map[string]string{t.labels[1]: "xyz.com"}
@ -228,15 +230,16 @@ func (t *dnsNameserverTest) run(isIPv6 bool) {
if t.name == "coredns" { if t.name == "coredns" {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
proxy . %v forward . %v
} }
acme.local:53 { acme.local:53 {
proxy . %v forward . %v
}`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP, t.dnsServerPod.Status.PodIP), }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP, t.dnsServerPod.Status.PodIP),
}}) }})
@ -325,12 +328,13 @@ func (t *dnsPtrFwdTest) run(isIPv6 bool) {
if t.name == "coredns" { if t.name == "coredns" {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
proxy . %v forward . %v
}`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP), }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),
}}) }})
@ -434,12 +438,13 @@ func (t *dnsExternalNameTest) run(isIPv6 bool) {
if t.name == "coredns" { if t.name == "coredns" {
t.setConfigMap(&v1.ConfigMap{Data: map[string]string{ t.setConfigMap(&v1.ConfigMap{Data: map[string]string{
"Corefile": fmt.Sprintf(`.:53 { "Corefile": fmt.Sprintf(`.:53 {
health
kubernetes %v in-addr.arpa ip6.arpa { kubernetes %v in-addr.arpa ip6.arpa {
pods insecure pods insecure
upstream upstream
fallthrough in-addr.arpa ip6.arpa fallthrough in-addr.arpa ip6.arpa
} }
proxy . %v forward . %v
}`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP), }`, framework.TestContext.ClusterDNSDomain, t.dnsServerPod.Status.PodIP),
}}) }})