From 9f5e1a140dd84da5a4752409f1ab951b37a73c81 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 12 Jul 2019 07:25:15 -0400 Subject: [PATCH] Make service "no endpoints" test use agnhost connect --- test/e2e/network/service.go | 10 +++++----- test/utils/image/manifest.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/network/service.go b/test/e2e/network/service.go index 75c24862f5f..2c510feb822 100644 --- a/test/e2e/network/service.go +++ b/test/e2e/network/service.go @@ -1839,23 +1839,23 @@ var _ = SIGDescribe("Services", func() { framework.ExpectNoError(err) serviceAddress := net.JoinHostPort(serviceName, strconv.Itoa(port)) - e2elog.Logf("waiting up to %v wget %v", framework.KubeProxyEndpointLagTimeout, serviceAddress) - cmd := fmt.Sprintf(`wget -T 3 -qO- %v`, serviceAddress) + e2elog.Logf("waiting up to %v to connect to %v", framework.KubeProxyEndpointLagTimeout, serviceAddress) + cmd := fmt.Sprintf("/agnhost connect --timeout=3s %s", serviceAddress) ginkgo.By(fmt.Sprintf("hitting service %v from pod %v on node %v", serviceAddress, podName, nodeName)) - expectedErr := "connection refused" + expectedErr := "REFUSED" if pollErr := wait.PollImmediate(framework.Poll, framework.KubeProxyEndpointLagTimeout, func() (bool, error) { _, err := framework.RunHostCmd(execPod.Namespace, execPod.Name, cmd) if err != nil { - if strings.Contains(strings.ToLower(err.Error()), expectedErr) { + if strings.Contains(err.Error(), expectedErr) { e2elog.Logf("error contained '%s', as expected: %s", expectedErr, err.Error()) return true, nil } e2elog.Logf("error didn't contain '%s', keep trying: %s", expectedErr, err.Error()) return false, nil } - return true, errors.New("expected wget call to fail") + return true, errors.New("expected connect call to fail") }); pollErr != nil { framework.ExpectNoError(pollErr) } diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index e3d43478dde..d56db8d910a 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -199,7 +199,7 @@ const ( func initImageConfigs() map[int]Config { configs := map[int]Config{} - configs[Agnhost] = Config{e2eRegistry, "agnhost", "2.2"} + configs[Agnhost] = Config{e2eRegistry, "agnhost", "2.4"} configs[Alpine] = Config{dockerLibraryRegistry, "alpine", "3.7"} configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"}