Add note: kubelet manages only k8s containers.

bug 1328441 Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1328441
lavalamp · Aug 15, 2016 · 08945a9 · 08945a9
1 parent ea69570
commit 08945a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go
@@ -101,7 +101,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
@@ -396,7 +396,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)