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

Variable & timeout cleanup in no-endpoints e2e test

Browse Source
This commit is contained in:
Vallery Lancey 2019-01-25 16:17:22 -08:00
parent 5a3b8a11fc
commit 21cccbb863
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/network/service.go
View File

@ -1758,19 +1758,18 @@ var _ = SIGDescribe("Services", func() {
labels := map[string]string{ labels := map[string]string{
"nopods": "nopods", "nopods": "nopods",
} }
port := 80
ports := []v1.ServicePort{{ ports := []v1.ServicePort{{
Port: 80, Port: int32(port),
TargetPort: intstr.FromInt(80), TargetPort: intstr.FromInt(80),
}} }}
By("creating a service with no endpoints") By("creating a service with no endpoints")
svc, err := jig.CreateServiceWithServicePort(labels, namespace, ports) _, err := jig.CreateServiceWithServicePort(labels, namespace, ports)
if err != nil { if err != nil {
framework.Failf("Failed to create service: %v", err) framework.Failf("Failed to create service: %v", err)
} }
port := strconv.Itoa(int(svc.Spec.Ports[0].Port))
servicePort := net.JoinHostPort(serviceName, port)
nodeName := nodes.Items[0].Name nodeName := nodes.Items[0].Name
podName := "execpod-noendpoints" podName := "execpod-noendpoints"
@ -1781,10 +1780,11 @@ var _ = SIGDescribe("Services", func() {
execPod, err := f.ClientSet.CoreV1().Pods(namespace).Get(execPodName, metav1.GetOptions{}) execPod, err := f.ClientSet.CoreV1().Pods(namespace).Get(execPodName, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.Logf("waiting up to %v wget %v", framework.KubeProxyEndpointLagTimeout, servicePort) serviceAddress := net.JoinHostPort(serviceName, strconv.Itoa(port))
cmd := fmt.Sprintf(`wget -T 10 -qO- %v`, servicePort) framework.Logf("waiting up to %v wget %v", framework.KubeProxyEndpointLagTimeout, serviceAddress)
cmd := fmt.Sprintf(`wget -T 3 -qO- %v`, serviceAddress)
By(fmt.Sprintf("hitting service %v from pod %v on node %v", servicePort, podName, nodeName)) By(fmt.Sprintf("hitting service %v from pod %v on node %v", serviceAddress, podName, nodeName))
expectedErr := "connection refused" expectedErr := "connection refused"
if pollErr := wait.PollImmediate(framework.Poll, framework.KubeProxyEndpointLagTimeout, func() (bool, error) { if pollErr := wait.PollImmediate(framework.Poll, framework.KubeProxyEndpointLagTimeout, func() (bool, error) {
_, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd) _, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd)