github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubeadm: fix CRI ListKubeContainers API

Browse Source 
Current implementation of this API always returns
checks output of 'crictl pods -q' and filters out everything
that doesn't start with k8s_. 'crictl pods -q' returns only pod ids,
so everything is always filtered out.

Removing filtering by name prefix should fix this.

Fixes: kubernetes/kubeadm#926
This commit is contained in:
Ed Bartosh
2018-08-06 17:11:49 +03:00
parent db9545e69e
commit d64f489fa1
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kubeadm/app/cmd/reset_test.go
View File

@@ -249,12 +249,10 @@ func TestRemoveContainers(t *testing.T) {
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
func() ([]byte, error) { return []byte("id1\nid2"), nil }, func() ([]byte, error) { return []byte("id1\nid2"), nil },
}, func() ([]byte, error) { return []byte(""), nil },
RunScript: []fakeexec.FakeRunAction{ func() ([]byte, error) { return []byte(""), nil },
func() ([]byte, []byte, error) { return nil, nil, nil }, func() ([]byte, error) { return []byte(""), nil },
func() ([]byte, []byte, error) { return nil, nil, nil }, func() ([]byte, error) { return []byte(""), nil },
func() ([]byte, []byte, error) { return nil, nil, nil },
func() ([]byte, []byte, error) { return nil, nil, nil },
}, },
} }
fexec := fakeexec.FakeExec{ fexec := fakeexec.FakeExec{

4
cmd/kubeadm/app/util/runtime/runtime.go
View File

@@ -108,9 +108,7 @@ func (runtime *CRIRuntime) ListKubeContainers() ([]string, error) {
} }
pods := []string{} pods := []string{}
for _, pod := range strings.Fields(string(out)) { for _, pod := range strings.Fields(string(out)) {
if strings.HasPrefix(pod, "k8s_") { pods = append(pods, pod)
pods = append(pods, pod)
}
} }
return pods, nil return pods, nil
} }

2
cmd/kubeadm/app/util/runtime/runtime_test.go
View File

@@ -128,7 +128,7 @@ func TestIsRunning(t *testing.T) {
func TestListKubeContainers(t *testing.T) { func TestListKubeContainers(t *testing.T) {
fcmd := fakeexec.FakeCmd{ fcmd := fakeexec.FakeCmd{
CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{ CombinedOutputScript: []fakeexec.FakeCombinedOutputAction{
func() ([]byte, error) { return []byte("k8s_p1\nk8s_p2\nid3"), nil }, func() ([]byte, error) { return []byte("k8s_p1\nk8s_p2"), nil },
func() ([]byte, error) { return nil, &fakeexec.FakeExitError{Status: 1} }, func() ([]byte, error) { return nil, &fakeexec.FakeExitError{Status: 1} },
func() ([]byte, error) { return []byte("k8s_p1\nk8s_p2"), nil }, func() ([]byte, error) { return []byte("k8s_p1\nk8s_p2"), nil },
}, },