Merge pull request #1195 from wojtek-t/nanny_change

Enable operating on microvalues in addong resizer

Author: piosz

addon-resizer/Makefile

@@ -25,7 +25,7 @@
 OUT_DIR = build
 PACKAGE = k8s.io/contrib/addon-resizer
 PREFIX = gcr.io/google_containers
-TAG = 1.2
+TAG = 1.3
 
 # Rules for building the real image for deployment to gcr.io
 

addon-resizer/nanny/estimator.go

@@ -17,6 +17,8 @@ limitations under the License.
 package nanny
 
 import (
+	"fmt"
+
 	api "k8s.io/kubernetes/pkg/api/v1"
 
 	"k8s.io/kubernetes/pkg/api/resource"
@@ -61,10 +63,18 @@ func calculateResources(numNodes uint64, resources []Resource) *api.ResourceRequ
 	limits := make(api.ResourceList)
 	requests := make(api.ResourceList)
 	for _, r := range resources {
-		val := r.Base.MilliValue() + r.ExtraPerNode.MilliValue()*int64(numNodes)
-		newRes := resource.NewMilliQuantity(val, r.Base.Format)
-		limits[r.Name] = *newRes
-		requests[r.Name] = *newRes
+		// Since we want to enable passing values smaller than e.g. 1 millicore per node,
+		// we need to have some more hacky solution here than operating on MilliValues.
+		perNodeString := r.ExtraPerNode.String()
+		var perNode float64
+		read, _ := fmt.Sscanf(perNodeString, "%f", &perNode)
+		overhead := resource.MustParse(fmt.Sprintf("%f%s", perNode*float64(numNodes), perNodeString[read:]))
+
+		newRes := r.Base
+		newRes.Add(overhead)
+
+		limits[r.Name] = newRes
+		requests[r.Name] = newRes
 	}
 	return &api.ResourceRequirements{
 		Limits:   limits,

addon-resizer/nanny/estimator_test.go

@@ -85,6 +85,15 @@ var (
 			},
 		},
 	}
+	lessThanMilliEstimator = LinearEstimator{
+		Resources: []Resource{
+			{
+				Base:         resource.MustParse("0.3"),
+				ExtraPerNode: resource.MustParse("0.5m"),
+				Name:         "cpu",
+			},
+		},
+	}
 	emptyEstimator = LinearEstimator{
 		Resources: []Resource{},
 	}
@@ -109,6 +118,16 @@ var (
 		},
 		ScaleFactor: 1.5,
 	}
+	exponentialLessThanMilliEstimator = ExponentialEstimator{
+		Resources: []Resource{
+			{
+				Base:         resource.MustParse("0.3"),
+				ExtraPerNode: resource.MustParse("0.5m"),
+				Name:         "cpu",
+			},
+		},
+		ScaleFactor: 1.5,
+	}
 
 	baseResources = api.ResourceList{
 		"cpu":     resource.MustParse("0.3"),
@@ -145,6 +164,12 @@ var (
 		"cpu":    resource.MustParse("3.3"),
 		"memory": resource.MustParse("33Mi"),
 	}
+	threeNodeLessThanMilliResources = api.ResourceList{
+		"cpu": resource.MustParse("0.3015"),
+	}
+	threeNodeLessThanMilliExpResources = api.ResourceList{
+		"cpu": resource.MustParse("0.308"),
+	}
 	noResources = api.ResourceList{}
 
 	sixteenNodeResources = api.ResourceList{
@@ -191,6 +216,7 @@ func TestEstimateResources(t *testing.T) {
 		{noMemoryEstimator, 3, threeNodeNoMemoryResources, threeNodeNoMemoryResources},
 		{noStorageEstimator, 0, noStorageBaseResources, noStorageBaseResources},
 		{noStorageEstimator, 3, threeNodeNoStorageResources, threeNodeNoStorageResources},
+		{lessThanMilliEstimator, 3, threeNodeLessThanMilliResources, threeNodeLessThanMilliResources},
 		{emptyEstimator, 0, noResources, noResources},
 		{emptyEstimator, 3, noResources, noResources},
 		{exponentialEstimator, 0, sixteenNodeResources, sixteenNodeResources},
@@ -200,6 +226,7 @@ func TestEstimateResources(t *testing.T) {
 		{exponentialEstimator, 17, twentyFourNodeResources, twentyFourNodeResources},
 		{exponentialEstimator, 20, twentyFourNodeResources, twentyFourNodeResources},
 		{exponentialEstimator, 24, twentyFourNodeResources, twentyFourNodeResources},
+		{exponentialLessThanMilliEstimator, 3, threeNodeLessThanMilliExpResources, threeNodeLessThanMilliExpResources},
 	}
 
 	for _, tc := range testCases {