Merge pull request kubernetes#30435 from hodovska/1328441-non-k8scont…

…ainers Automatic merge from submit-queue Add note: kubelet manages only k8s containers. Kubelet wrote log when accesing container which was not created in k8s, what could confuse users. That's why we added note about it in documentation and lowered log level of the message to 5. Here is example of the message: ``` > Apr 19 11:50:32 openshift-114.lab.sjc.redhat.com atomic-openshift-node[9551]: I0419 11:50:32.194020 9600 docker.go:363] Docker Container: /tiny_babbage is not managed by kubelet. ``` bug 1328441 Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1328441
lavalamp · Aug 17, 2016 · 622db63 · 622db63
2 parents b22ba87 + 08945a9
commit 622db63
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
@@ -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
@@ -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)