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

golint

Browse Source 
flip logging messages

run pod->node conformance tests the same way
This commit is contained in:
jay vyas 2020-08-10 10:52:50 -04:00 committed by jay vyas
parent 35f5e8e66f
commit ccbfa84173
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
test/e2e/common/networking.go
View File

@ -28,6 +28,25 @@ var _ = ginkgo.Describe("[sig-network] Networking", func() {
ginkgo.Describe("Granular Checks: Pods", func() {
checkNodeConnectivity := func(config *e2enetwork.NetworkingTestConfig, protocol string, port int) {
errors := []error{}
for _, endpointPod := range config.EndpointPods {
if err := config.DialFromTestContainer(protocol, endpointPod.Status.PodIP, port, config.MaxTries, 0, sets.NewString(endpointPod.Name)); err != nil {
errors = append(errors, err)
framework.Logf("Warning: Test failure (%v) will occur due to %v", len(errors)+1, err) // convenient error message for diagnosis... how many pods failed, and on what hosts?
} else {
framework.Logf("Was able to reach %v on %v ", endpointPod.Status.PodIP, endpointPod.Status.HostIP)
}
}
if len(errors) > 0 {
framework.Logf("Pod polling failure summary:")
for _, e := range errors {
framework.Logf("%v", e)
}
framework.Failf("Failed due to %v errors polling %v pods", len(errors), len(config.EndpointPods))
}
}
// Try to hit all endpoints through a test container, retry 5 times,
// expect exactly one unique hostname. Each of these endpoints reports
// its own hostname.
@ -39,24 +58,7 @@ var _ = ginkgo.Describe("[sig-network] Networking", func() {
*/
framework.ConformanceIt("should function for intra-pod communication: http [NodeConformance]", func() {
config := e2enetwork.NewCoreNetworkingTestConfig(f, false)
// Extra debugging info since this is the most common diagnostic for failing clusters, and is a Conformance test.
errors := []error{}
for _, endpointPod := range config.EndpointPods {
if err := config.DialFromTestContainer("http", endpointPod.Status.PodIP, e2enetwork.EndpointHTTPPort, config.MaxTries, 0, sets.NewString(endpointPod.Name)); err != nil {
errors = append(errors, err)
framework.Logf("Was able to reach %v on %v ", endpointPod.Status.PodIP, endpointPod.Status.HostIP)
} else {
framework.Logf("Warning: Test failure (%v) will occur due to %v", len(errors)+1, err) // convenient error message for diagnosis... how many pods failed, and on what hosts?
}
}
if len(errors) > 0 {
framework.Logf("Pod polling failure summary:")
for _, e := range errors {
framework.Logf("%v", e)
}
framework.Failf("Failed due to %v errors polling %v pods", len(errors), len(config.EndpointPods))
}
checkNodeConnectivity(config, "http", e2enetwork.EndpointHTTPPort)
})
/*
@ -67,9 +69,7 @@ var _ = ginkgo.Describe("[sig-network] Networking", func() {
*/
framework.ConformanceIt("should function for intra-pod communication: udp [NodeConformance]", func() {
config := e2enetwork.NewCoreNetworkingTestConfig(f, false)
for _, endpointPod := range config.EndpointPods {
config.DialFromTestContainer("udp", endpointPod.Status.PodIP, e2enetwork.EndpointUDPPort, config.MaxTries, 0, sets.NewString(endpointPod.Name))
}
checkNodeConnectivity(config, "udp", e2enetwork.EndpointUDPPort)
})
/*
@ -81,9 +81,7 @@ var _ = ginkgo.Describe("[sig-network] Networking", func() {
*/
framework.ConformanceIt("should function for node-pod communication: http [LinuxOnly] [NodeConformance]", func() {
config := e2enetwork.NewCoreNetworkingTestConfig(f, true)
for _, endpointPod := range config.EndpointPods {
config.DialFromNode("http", endpointPod.Status.PodIP, e2enetwork.EndpointHTTPPort, config.MaxTries, 0, sets.NewString(endpointPod.Name))
}
checkNodeConnectivity(config, "http", e2enetwork.EndpointHTTPPort)
})
/*
@ -95,9 +93,7 @@ var _ = ginkgo.Describe("[sig-network] Networking", func() {
*/
framework.ConformanceIt("should function for node-pod communication: udp [LinuxOnly] [NodeConformance]", func() {
config := e2enetwork.NewCoreNetworkingTestConfig(f, true)
for _, endpointPod := range config.EndpointPods {
config.DialFromNode("udp", endpointPod.Status.PodIP, e2enetwork.EndpointUDPPort, config.MaxTries, 0, sets.NewString(endpointPod.Name))
}
checkNodeConnectivity(config, "udp", e2enetwork.EndpointUDPPort)
})
})
})

3
test/e2e/framework/network/utils.go
View File

@ -280,11 +280,10 @@ func (config *NetworkingTestConfig) DialFromContainer(protocol, dialCommand, con
// TODO: get rid of this delay #36281
time.Sleep(hitEndpointRetryDelay)
}
if dialCommand == echoHostname {
config.diagnoseMissingEndpoints(responses)
}
return fmt.Errorf("Did not find expected responses... \nTries %d\nCommand %v\nretrieved %v\nexpected %v\n", maxTries, cmd, responses, expectedResponses)
return fmt.Errorf("did not find expected responses... \nTries %d\nCommand %v\nretrieved %v\nexpected %v", maxTries, cmd, responses, expectedResponses)
}
// GetEndpointsFromTestContainer executes a curl via kubectl exec in a test container.