kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Drop all empty strings from containers list, add fake prefix in log messages

pull/3679/head
Thomas Stromberg 2019-02-15 09:46:15 -08:00
parent f345fe4b08
commit bb752098df
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/minikube/cruntime/cri.go
View File

@ -32,12 +32,13 @@ func listCRIContainers(cr CommandRunner, filter string) ([]string, error) {
if err != nil {
return nil, err
}
content = strings.TrimSpace(content)
// Otherwise, strings.Split will return []string{""}
if content == "" {
return []string{}, nil
var ids []string
for _, line := range strings.Split(content, "\n") {
if line != "" {
ids = append(ids, line)
}
}
return strings.Split(content, "\n"), nil
return ids, nil
}
// criCRIContainers kills a list of containers using crictl

26
pkg/minikube/cruntime/cruntime_test.go
View File

@ -153,18 +153,18 @@ func (f *FakeRunner) docker(args []string, root bool) (string, error) {
filter := strings.Split(args[2], `"`)[1]
fname := strings.Split(filter, "=")[1]
ids := []string{}
f.t.Logf("Looking for containers matching %q", fname)
f.t.Logf("fake docker: Looking for containers matching %q", fname)
for id, cname := range f.containers {
if strings.Contains(cname, fname) {
ids = append(ids, id)
}
}
f.t.Logf("Found containers: %v", ids)
f.t.Logf("fake docker: Found containers: %v", ids)
return strings.Join(ids, "\n"), nil
}
case "stop":
for _, id := range args[1:] {
f.t.Logf("Stopping id %q", id)
f.t.Logf("fake docker: Stopping id %q", id)
if f.containers[id] == "" {
return "", fmt.Errorf("no such container")
}
@ -173,7 +173,7 @@ func (f *FakeRunner) docker(args []string, root bool) (string, error) {
case "rm":
// Skip "-f" argument
for _, id := range args[2:] {
f.t.Logf("Removing id %q", id)
f.t.Logf("fake docker: Removing id %q", id)
if f.containers[id] == "" {
return "", fmt.Errorf("no such container")
}
@ -193,18 +193,18 @@ func (f *FakeRunner) crictl(args []string, root bool) (string, error) {
if args[1] == "-a" && strings.HasPrefix(args[2], "--name") {
fname := strings.Split(args[2], "=")[1]
ids := []string{}
f.t.Logf("Looking for containers matching %q", fname)
f.t.Logf("fake crictl: Looking for containers matching %q", fname)
for id, cname := range f.containers {
if strings.Contains(cname, fname) {
ids = append(ids, id)
}
}
f.t.Logf("Found containers: %v", ids)
f.t.Logf("fake crictl: Found containers: %v", ids)
return strings.Join(ids, "\n"), nil
}
case "stop":
for _, id := range args[1:] {
f.t.Logf("Stopping id %q", id)
f.t.Logf("fake crictl: Stopping id %q", id)
if f.containers[id] == "" {
return "", fmt.Errorf("no such container")
}
@ -212,7 +212,7 @@ func (f *FakeRunner) crictl(args []string, root bool) (string, error) {
}
case "rm":
for _, id := range args[1:] {
f.t.Logf("Removing id %q", id)
f.t.Logf("fake crictl: Removing id %q", id)
if f.containers[id] == "" {
return "", fmt.Errorf("no such container")
}
@ -249,21 +249,21 @@ func (f *FakeRunner) systemctl(args []string, root bool) (string, error) {
return out, fmt.Errorf("not root")
}
f.services[svc] = Exited
f.t.Logf("stopped %s", svc)
f.t.Logf("fake systemctl: stopped %s", svc)
case "start":
if !root {
return out, fmt.Errorf("not root")
}
f.services[svc] = Running
f.t.Logf("started %s", svc)
f.t.Logf("fake systemctl: started %s", svc)
case "restart":
if !root {
return out, fmt.Errorf("not root")
}
f.services[svc] = Restarted
f.t.Logf("restarted %s", svc)
f.t.Logf("fake systemctl: restarted %s", svc)
case "is-active":
f.t.Logf("%s is-status: %v", svc, state)
f.t.Logf("fake systemctl: %s is-status: %v", svc, state)
if state == Running {
return out, nil
}
@ -402,7 +402,7 @@ func TestContainerFunctions(t *testing.T) {
if err != nil {
t.Fatalf("ListContainers: %v", err)
}
want = []string{}
want = nil
if diff := cmp.Diff(got, want, sortSlices); diff != "" {
t.Errorf("ListContainers(apiserver) unexpected results, diff (-got + want): %s", diff)
}

11
pkg/minikube/cruntime/docker.go
View File

@ -89,12 +89,13 @@ func (r *Docker) ListContainers(filter string) ([]string, error) {
if err != nil {
return nil, err
}
content = strings.TrimSpace(content)
// Otherwise, strings.Split will return []string{""}
if content == "" {
return []string{}, nil
var ids []string
for _, line := range strings.Split(content, "\n") {
if line != "" {
ids = append(ids, line)
}
}
return strings.Split(content, "\n"), nil
return ids, nil
}
// KillContainers forcibly removes a running container based on ID