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

Make service "no endpoints" test use agnhost connect

Browse Source
This commit is contained in:
Dan Winship
2019-07-12 07:25:15 -04:00
parent a46eed0ca3
commit 9f5e1a140d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1839,23 +1839,23 @@ var _ = SIGDescribe("Services", func() {
framework.ExpectNoError(err) framework.ExpectNoError(err)
serviceAddress := net.JoinHostPort(serviceName, strconv.Itoa(port)) serviceAddress := net.JoinHostPort(serviceName, strconv.Itoa(port))
e2elog.Logf("waiting up to %v wget %v", framework.KubeProxyEndpointLagTimeout, serviceAddress) e2elog.Logf("waiting up to %v to connect to %v", framework.KubeProxyEndpointLagTimeout, serviceAddress)
cmd := fmt.Sprintf(`wget -T 3 -qO- %v`, 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)) 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) { 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)
if err != nil { 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()) e2elog.Logf("error contained '%s', as expected: %s", expectedErr, err.Error())
return true, nil return true, nil
} }
e2elog.Logf("error didn't contain '%s', keep trying: %s", expectedErr, err.Error()) e2elog.Logf("error didn't contain '%s', keep trying: %s", expectedErr, err.Error())
return false, nil return false, nil
} }
return true, errors.New("expected wget call to fail") return true, errors.New("expected connect call to fail")
}); pollErr != nil { }); pollErr != nil {
framework.ExpectNoError(pollErr) framework.ExpectNoError(pollErr)
} }

2
test/utils/image/manifest.go
View File

@@ -199,7 +199,7 @@ const (
func initImageConfigs() map[int]Config { func initImageConfigs() map[int]Config {
configs := 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[Alpine] = Config{dockerLibraryRegistry, "alpine", "3.7"}
configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"} configs[AuthenticatedAlpine] = Config{gcAuthenticatedRegistry, "alpine", "3.7"}
configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"} configs[AuthenticatedWindowsNanoServer] = Config{gcAuthenticatedRegistry, "windows-nanoserver", "v1"}