github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #436 from claire921/k

Browse Source 
pkg/kubelet: explicitly return nil as error and nil as a result on error
This commit is contained in:
Clayton Coleman 2014-07-12 14:20:04 -04:00
commit 1603e17c4a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet.go
View File

@ -192,7 +192,7 @@ func (kl *Kubelet) getDockerContainers() (map[DockerID]docker.APIContainers, err
result := map[DockerID]docker.APIContainers{}
containerList, err := kl.DockerClient.ListContainers(docker.ListContainersOptions{})
if err != nil {
return result, err
return nil, err
}
for _, value := range containerList {
// Skip containers that we didn't create to allow users to manually
@ -202,7 +202,7 @@ func (kl *Kubelet) getDockerContainers() (map[DockerID]docker.APIContainers, err
}
result[DockerID(value.ID)] = value
}
return result, err
return result, nil
}
// Return Docker's container ID for a manifest's container. Returns an empty string if it doesn't exist.