Skip to content

K
k3s
Unverified Commit 95307254 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67017 from bart0sh/PR0027-kubeadm-fix-CRI-ListKubeContainers

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kubeadm: fix CRI ListKubeContainers API **What this PR does / why we need it**: 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. **Which issue this PR fixes** Fixes: kubernetes/kubeadm#926 **Release note**: ```release-note NONE ```
parents 819253dd d64f489f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 10 deletions
cmd/kubeadm/app/cmd/reset_test.go
View file @ 95307254
...@@ -248,12 +248,10 @@ func TestRemoveContainers(t *testing.T) { ...@@ -248,12 +248,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{
......
cmd/kubeadm/app/util/runtime/runtime.go
View file @ 95307254
...@@ -108,9 +108,7 @@ func (runtime *CRIRuntime) ListKubeContainers() ([]string, error) { ...@@ -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
} }
......
cmd/kubeadm/app/util/runtime/runtime_test.go
View file @ 95307254
...@@ -128,7 +128,7 @@ func TestIsRunning(t *testing.T) { ...@@ -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 },
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment