From 06cd5158e7e31c09b3c22b640b384df653e02645 Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Thu, 11 Jun 2020 19:23:37 -0700 Subject: [PATCH] test: Hide host endpoint from runtime tests [ upstream commit 7cfe6f238c5668ecf405ddeadeed52f67a3c9431 ] 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: https://github.com/cilium/cilium/issues/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 --- test/helpers/cilium.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/helpers/cilium.go b/test/helpers/cilium.go index f3c452b6f902..77e1da124661 100644 --- a/test/helpers/cilium.go +++ b/test/helpers/cilium.go @@ -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