Merge pull request #453 from brendandburns/memory

Add support for memory limits in the kubelet.

Merge pull request #453 from brendandburns/memory
07fafb12 · Clayton Coleman · 4046df4a · 92d83640 · 07fafb12
Commit 07fafb12 authored Jul 15, 2014 by Clayton Coleman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

kubelet.go pkg/kubelet/kubelet.go +4 -3

No files found.
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -391,13 +391,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)