From fbd3e85e9c17303e58b9a0c60324ce4d9a9b77c0 Mon Sep 17 00:00:00 2001
From: Rohit Jnagal <jnagal@google.com>
Date: Tue, 29 Jul 2014 18:34:16 +0000
Subject: [PATCH] Fix handling of default cpu shares.

---
 pkg/kubelet/kubelet.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 6b9f8fe7345..a756b8a1b95 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -242,6 +242,10 @@ func makePortsAndBindings(container *api.Container) (map[docker.Port]struct{}, m
 }
 
 func milliCPUToShares(milliCPU int) int {
+	if milliCPU == 0 {
+		// zero milliCPU means unset. Use kernel default.
+		return 0
+	}
 	// Conceptually (milliCPU / milliCPUToCPU) * sharesPerCPU, but factored to improve rounding.
 	shares := (milliCPU * sharesPerCPU) / milliCPUToCPU
 	if shares < minShares {