Updated addon resizer to be compatible with the newest version of Kubernetes

Author: piosz

addon-resizer/nanny/estimator.go

@@ -20,8 +20,6 @@ import (
 	api "k8s.io/kubernetes/pkg/api/v1"
 
 	"k8s.io/kubernetes/pkg/api/resource"
-
-	inf "speter.net/go/exp/math/dec/inf"
 )
 
 // Resource defines the name of a resource, the quantity, and the marginal value.
@@ -39,17 +37,10 @@ func (e LinearEstimator) scaleWithNodes(numNodes uint64) *api.ResourceRequiremen
 	limits := make(api.ResourceList)
 	requests := make(api.ResourceList)
 	for _, r := range e.Resources {
-		num := inf.NewDec(int64(numNodes), 0)
-		num.Mul(num, r.ExtraPerNode.Amount)
-		num.Add(num, r.Base.Amount)
-		limits[r.Name] = resource.Quantity{
-			Amount: num,
-			Format: r.Base.Format,
-		}
-		requests[r.Name] = resource.Quantity{
-			Amount: num,
-			Format: r.Base.Format,
-		}
+		val := r.Base.MilliValue() + r.ExtraPerNode.MilliValue()*int64(numNodes)
+		newRes := resource.NewMilliQuantity(val, r.Base.Format)
+		limits[r.Name] = *newRes
+		requests[r.Name] = *newRes
 	}
 	return &api.ResourceRequirements{
 		Limits:   limits,

addon-resizer/nanny/estimator_test.go

@@ -17,7 +17,6 @@ limitations under the License.
 package nanny
 
 import (
-	"reflect"
 	"testing"
 
 	resource "k8s.io/kubernetes/pkg/api/resource"
@@ -128,6 +127,21 @@ var (
 	noResources = api.ResourceList{}
 )
 
+func verifyResources(t *testing.T, kind string, got, want api.ResourceList) {
+	if len(got) != len(want) {
+		t.Errorf("%s not equal got: %+v want: %+v", kind, got, want)
+	}
+	for res, val := range want {
+		actVal, ok := got[res]
+		if !ok {
+			t.Errorf("missing resource %s in %s", res, kind)
+		}
+		if val.Cmp(actVal) != 0 {
+			t.Errorf("not equal resource %s in %s, got: %+v, want: %+v", res, kind, actVal, val)
+		}
+	}
+}
+
 func TestEstimateResources(t *testing.T) {
 	testCases := []struct {
 		e        ResourceEstimator
@@ -147,14 +161,13 @@ func TestEstimateResources(t *testing.T) {
 		{emptyEstimator, 3, noResources, noResources},
 	}
 
-	for i, tc := range testCases {
+	for _, tc := range testCases {
 		got := tc.e.scaleWithNodes(tc.numNodes)
 		want := &api.ResourceRequirements{
 			Limits:   tc.limits,
 			Requests: tc.requests,
 		}
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("scaleWithNodes got %v, want %v in test case %d", got, want, i)
-		}
+		verifyResources(t, "limits", got.Limits, want.Limits)
+		verifyResources(t, "requests", got.Requests, want.Limits)
 	}
 }

addon-resizer/nanny/nanny_lib.go

@@ -24,8 +24,8 @@ import (
 	"time"
 
 	log "github.com/golang/glog"
+	inf "gopkg.in/inf.v0"
 	api "k8s.io/kubernetes/pkg/api/v1"
-	inf "speter.net/go/exp/math/dec/inf"
 )
 
 // checkResource determines whether a specific resource needs to be over-written.
@@ -38,7 +38,7 @@ func checkResource(threshold int64, actual, expected api.ResourceList, res api.R
 	if !ok && !expOk {
 		return false
 	}
-	q := new(inf.Dec).QuoRound(val.Amount, expVal.Amount, 2, inf.RoundDown)
+	q := new(inf.Dec).QuoRound(val.AsDec(), expVal.AsDec(), 2, inf.RoundDown)
 	lower := inf.NewDec(100-threshold, 2)
 	upper := inf.NewDec(100+threshold, 2)
 	if q.Cmp(lower) == -1 || q.Cmp(upper) == 1 {