Skip to content

K
k3s
Commit 622db632 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30435 from hodovska/1328441-non-k8scontainers

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
parents b22ba87a 08945a9b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
cmd/kubelet/app/server.go
View file @ 622db632
...@@ -102,7 +102,8 @@ func NewKubeletCommand() *cobra.Command { ...@@ -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 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 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 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 Other than from an PodSpec from the apiserver, there are three ways that a container
manifest can be provided to the Kubelet. manifest can be provided to the Kubelet.
......
pkg/kubelet/dockertools/docker.go
View file @ 622db632
...@@ -443,7 +443,7 @@ func GetKubeletDockerContainers(client DockerInterface, allContainers bool) ([]* ...@@ -443,7 +443,7 @@ func GetKubeletDockerContainers(client DockerInterface, allContainers bool) ([]*
// Skip containers that we didn't create to allow users to manually // Skip containers that we didn't create to allow users to manually
// spin up their own containers if they want. // spin up their own containers if they want.
if !strings.HasPrefix(container.Names[0], "/"+containerNamePrefix+"_") { 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 continue
} }
result = append(result, container) result = append(result, container)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment