github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only set sysctls for infra containers

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2016-09-09 15:51:12 +02:00
parent 6babfb6ccc
commit 962e7534b4
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/kubelet/dockertools/docker_manager.go
View File

@@ -687,18 +687,20 @@ func (dm *DockerManager) runContainer(
} }
// Set sysctls if requested // Set sysctls if requested
sysctls, unsafeSysctls, err := api.SysctlsFromPodAnnotations(pod.Annotations) if container.Name == PodInfraContainerName {
if err != nil { sysctls, unsafeSysctls, err := api.SysctlsFromPodAnnotations(pod.Annotations)
dm.recorder.Eventf(ref, api.EventTypeWarning, events.FailedToCreateContainer, "Failed to create docker container %q of pod %q with error: %v", container.Name, format.Pod(pod), err) if err != nil {
return kubecontainer.ContainerID{}, err dm.recorder.Eventf(ref, api.EventTypeWarning, events.FailedToCreateContainer, "Failed to create docker container %q of pod %q with error: %v", container.Name, format.Pod(pod), err)
} return kubecontainer.ContainerID{}, err
if len(sysctls)+len(unsafeSysctls) > 0 {
hc.Sysctls = make(map[string]string, len(sysctls)+len(unsafeSysctls))
for _, c := range sysctls {
hc.Sysctls[c.Name] = c.Value
} }
for _, c := range unsafeSysctls { if len(sysctls)+len(unsafeSysctls) > 0 {
hc.Sysctls[c.Name] = c.Value hc.Sysctls = make(map[string]string, len(sysctls)+len(unsafeSysctls))
for _, c := range sysctls {
hc.Sysctls[c.Name] = c.Value
}
for _, c := range unsafeSysctls {
hc.Sysctls[c.Name] = c.Value
}
} }
} }