Commit 962e7534 authored by Dr. Stefan Schimanski's avatar Dr. Stefan Schimanski

Only set sysctls for infra containers

parent 6babfb6c
...@@ -687,6 +687,7 @@ func (dm *DockerManager) runContainer( ...@@ -687,6 +687,7 @@ func (dm *DockerManager) runContainer(
} }
// Set sysctls if requested // Set sysctls if requested
if container.Name == PodInfraContainerName {
sysctls, unsafeSysctls, err := api.SysctlsFromPodAnnotations(pod.Annotations) sysctls, unsafeSysctls, err := api.SysctlsFromPodAnnotations(pod.Annotations)
if err != nil { if err != nil {
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) 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)
...@@ -701,6 +702,7 @@ func (dm *DockerManager) runContainer( ...@@ -701,6 +702,7 @@ func (dm *DockerManager) runContainer(
hc.Sysctls[c.Name] = c.Value hc.Sysctls[c.Name] = c.Value
} }
} }
}
// If current api version is newer than docker 1.10 requested, set OomScoreAdj to HostConfig // If current api version is newer than docker 1.10 requested, set OomScoreAdj to HostConfig
result, err := dm.checkDockerAPIVersion(dockerV110APIVersion) result, err := dm.checkDockerAPIVersion(dockerV110APIVersion)
......
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