From 08945a9b6ab9f654a5d43d404745936043cb4957 Mon Sep 17 00:00:00 2001 From: Dominika Hodovska Date: Thu, 11 Aug 2016 10:00:13 +0200 Subject: [PATCH] Add note: kubelet manages only k8s containers. bug 1328441 Bugzilla link https://bugzilla.redhat.com/show_bug.cgi?id=1328441 --- cmd/kubelet/app/server.go | 3 ++- pkg/kubelet/dockertools/docker.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e8ab609c348..177ad30b55e 100644 --- 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 index 8f84ae9f53a..f6474e3dea3 100644 --- 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)