diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index c07d9703702..5838bb90d4e 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -102,7 +102,8 @@ func NewKubeletCommand() *cobra.Command { node. The kubelet works in terms of a PodSpec. A PodSpec is a YAML or JSON object that describes a pod. The kubelet takes a set of PodSpecs that are provided through various mechanisms (primarily through the apiserver) and ensures that the containers -described in those PodSpecs are running and healthy. +described in those PodSpecs are running and healthy. The kubelet doesn't manage +containers which were not created by Kubernetes. Other than from an PodSpec from the apiserver, there are three ways that a container manifest can be provided to the Kubelet. diff --git a/pkg/kubelet/dockertools/docker.go b/pkg/kubelet/dockertools/docker.go index a552f792a72..d5f2c6aadb9 100644 --- a/pkg/kubelet/dockertools/docker.go +++ b/pkg/kubelet/dockertools/docker.go @@ -443,7 +443,7 @@ func GetKubeletDockerContainers(client DockerInterface, allContainers bool) ([]* // Skip containers that we didn't create to allow users to manually // spin up their own containers if they want. if !strings.HasPrefix(container.Names[0], "/"+containerNamePrefix+"_") { - glog.V(3).Infof("Docker Container: %s is not managed by kubelet.", container.Names[0]) + glog.V(5).Infof("Docker Container: %s is not managed by kubelet.", container.Names[0]) continue } result = append(result, container)