Add support for memory limits in the kubelet.

This commit is contained in:
Brendan Burns 2014-07-14 20:56:18 -07:00
parent dcbb309e4f
commit 92d83640c0

View File

@ -389,13 +389,14 @@ func (kl *Kubelet) runContainer(manifest *api.ContainerManifest, container *api.
opts := docker.CreateContainerOptions{
Name: buildDockerName(manifest, container),
Config: &docker.Config{
Cmd: container.Command,
Env: envVariables,
ExposedPorts: exposedPorts,
Hostname: container.Name,
Image: container.Image,
ExposedPorts: exposedPorts,
Env: envVariables,
Memory: int64(container.Memory),
Volumes: volumes,
WorkingDir: container.WorkingDir,
Cmd: container.Command,
},
}
dockerContainer, err := kl.DockerClient.CreateContainer(opts)