Merge pull request #92 from thestormforge/limit-request-ratio

Limit request ratio

Author: jgustie

pkg/api/applications/v2/recommendation.go

@@ -84,6 +84,7 @@ type ContainerResources struct {
 	TargetUtilization *ResourceList `json:"targetUtilization,omitempty"`
 	Tolerance         *ResourceList `json:"tolerance,omitempty"`
 	Bounds            *Bounds       `json:"bounds,omitempty"`
+	LimitRequestRatio *ResourceList `json:"limitRequestRatio,omitempty"`
 }
 
 type Bounds struct {

pkg/api/numorstr.go

@@ -38,7 +38,11 @@ func FromInt64(val int64) NumberOrString {
 
 // FromFloat64 returns the supplied value as a NumberOrString
 func FromFloat64(val float64) NumberOrString {
-	return NumberOrString{NumVal: json.Number(strconv.FormatFloat(val, 'f', -1, 64))}
+	s := strconv.FormatFloat(val, 'f', -1, 64)
+	if math.IsInf(val, 0) || math.IsNaN(val) {
+		return NumberOrString{StrVal: s, IsString: true}
+	}
+	return NumberOrString{NumVal: json.Number(s)}
 }
 
 // FromNumber returns the supplied value as a NumberOrString
@@ -166,6 +170,9 @@ func (s *NumberOrString) Quantity() *big.Float {
 		if v, ok := new(big.Float).SetString(strVal); ok {
 			return v.Mul(v, big.NewFloat(op))
 		}
+	} else if x, err := strconv.ParseFloat(s.StrVal, 64); err == nil { // +Inf, etc.
+		// We use `ParseFloat` instead of `s.Float64Value()` so we can explicitly check the error
+		return big.NewFloat(x)
 	}
 
 	return nil

pkg/api/numorstr_test.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"encoding/json"
+	"math"
 	"math/big"
 	"testing"
 
@@ -167,6 +168,12 @@ func TestNumberOrString_Float64Value(t *testing.T) {
 			value:    FromString("1"),
 			expected: 1.0,
 		},
+
+		{
+			desc:     "infinity",
+			value:    FromValue("infinity"),
+			expected: math.Inf(1),
+		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.desc, func(t *testing.T) {
@@ -292,6 +299,9 @@ func TestNumberOrString_Quantity(t *testing.T) {
 		{value: "1T", expected: 1000000000000},
 		{value: "1P", expected: 1000000000000000},
 		{value: "1E", expected: 1000000000000000000},
+
+		// These are out of spec
+		{value: "+Inf", expected: math.Inf(1)},
 	}
 	for _, tc := range cases {
 		t.Run(tc.value, func(t *testing.T) {

pkg/command/recommendation/options.go

@@ -37,6 +37,7 @@ const (
 	flagContainerResourcesRequestsMin          = "min-request"
 	flagContainerResourcesTargetUtilizationMax = "max-target-utilization"
 	flagContainerResourcesTargetUtilizationMin = "min-target-utilization"
+	flagContainerResourcesLimitRequestRatio    = "limit-request-ratio"
 )
 
 const (
@@ -68,6 +69,7 @@ type ContainerResourcesOptions struct {
 	BoundsRequestsMin          map[string]string
 	BoundsTargetUtilizationMax map[string]int64
 	BoundsTargetUtilizationMin map[string]int64
+	LimitRequestRatio          map[string]string
 }
 
 func (opts *ContainerResourcesOptions) AddFlags(cmd *cobra.Command) {
@@ -81,9 +83,11 @@ func (opts *ContainerResourcesOptions) AddFlags(cmd *cobra.Command) {
 	cmd.Flags().StringToStringVar(&opts.BoundsRequestsMin, flagContainerResourcesRequestsMin, opts.BoundsRequestsMin, "per-container resource min requests as `resource=quantity`; resource is one of: cpu|memory")
 	cmd.Flags().StringToInt64Var(&opts.BoundsTargetUtilizationMax, flagContainerResourcesTargetUtilizationMax, opts.BoundsTargetUtilizationMax, "per-container resource max target utilization as `resource=quantity`; resource is one of: cpu")
 	cmd.Flags().StringToInt64Var(&opts.BoundsTargetUtilizationMin, flagContainerResourcesTargetUtilizationMin, opts.BoundsTargetUtilizationMin, "per-container resource min target utilization as `resource=quantity`; resource is one of: cpu")
+	cmd.Flags().StringToStringVar(&opts.LimitRequestRatio, flagContainerResourcesLimitRequestRatio, opts.LimitRequestRatio, "per-container limit:request ratio as `resource=quantity`; resource is one of: cpu|memory")
 
 	cmd.Flag(flagContainerResourcesInterval).Hidden = true
 	cmd.Flag(flagContainerResourcesTargetUtilization).Hidden = true
+	cmd.Flag(flagContainerResourcesLimitRequestRatio).Hidden = true
 }
 
 func (opts *ContainerResourcesOptions) Apply(configuration *[]applications.Configuration) {
@@ -121,6 +125,14 @@ func (opts *ContainerResourcesOptions) Apply(configuration *[]applications.Confi
 		lazyContainerResources().Tolerance = tolerance
 	}
 
+	if size := len(opts.LimitRequestRatio); size > 0 {
+		limitRequestRatio := &applications.ResourceList{}
+		for k, v := range opts.LimitRequestRatio {
+			limitRequestRatio.Set(strings.ToLower(k), api.FromValue(v))
+		}
+		lazyContainerResources().LimitRequestRatio = limitRequestRatio
+	}
+
 	bounds := &applications.Bounds{}
 	lazyLimits := func() *applications.BoundsRange {
 		if bounds.Limits == nil {