From 92d83640c0f550a5305f4c36d16662eac2dc54c9 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Mon, 14 Jul 2014 20:56:18 -0700 Subject: [PATCH] Add support for memory limits in the kubelet. --- pkg/kubelet/kubelet.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 263f6c89f82..0bf46257b68 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -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)