Skip to content

Commit

Permalink
test: Hide host endpoint from runtime tests
Browse files Browse the repository at this point in the history
[ upstream commit 7cfe6f2 ]

The host endpoint introduces some interesting interactions between the
API, the host endpoint datapath configuration management and the
recently proposed autodisabling of debug mode for the host endpoint.
These issues are tracked in more detail here:

#12037

For now, skip the host endpoint when iterating through endpoints in
runtime tests to simplify working around this issue; coverage is
otherwise the same as for previous releases. We can figure out the right
long-term handling of the host endpoint in RuntimeMonitor tests via the
above issue and unblock PR #11977 with this commit.

Signed-off-by: Joe Stringer <joe@cilium.io>
  • Loading branch information
joestringer committed Jun 12, 2020
1 parent 38a30b3 commit 06cd515
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion test/helpers/cilium.go
Expand Up @@ -321,7 +321,12 @@ func (s *SSHMeta) GetEndpointsIds() (map[string]string, error) {
if !endpoints.WasSuccessful() {
return nil, fmt.Errorf("%q failed: %s", cmd, endpoints.CombineOutput())
}
return endpoints.KVOutput(), nil

// Special case the host endpoint: GH-12037
result := endpoints.KVOutput()
delete(result, "")

return result, nil
}

// GetEndpointsIdentityIds returns a mapping of a Docker container name to it's
Expand Down

0 comments on commit 06cd515

Please sign in to comment.