Merge pull request kubernetes#3330 from uswitch/fix_boundary_panic

k8s-ci-robot · web-flow · commit fa9efa2d6051 · 2020-07-21T04:59:15.000-07:00
VPA: fix nil pointer in getBoundaryRecommendation when no limits set
diff --git a/vertical-pod-autoscaler/pkg/utils/vpa/limit_and_request_scaling.go b/vertical-pod-autoscaler/pkg/utils/vpa/limit_and_request_scaling.go
@@ -97,7 +97,7 @@ func GetBoundaryRequest(originalRequest, originalLimit, boundaryLimit, defaultLi
 	}
 	// originalLimit not set, no boundary
 	if originalLimit == nil || originalLimit.Value() == 0 {
-		return nil
+		return &resource.Quantity{}
 	}
 	// originalLimit set but originalRequest not set - K8s will treat the pod as if they were equal
 	if originalRequest == nil || originalRequest.Value() == 0 {

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func GetBoundaryRequest(originalRequest, originalLimit, boundaryLimit, defaultLi`
`97`	`97`	`}`
`98`	`98`	`// originalLimit not set, no boundary`
`99`	`99`	`if originalLimit == nil \|\| originalLimit.Value() == 0 {`
`100`		`- return nil`
	`100`	`+ return &resource.Quantity{}`
`101`	`101`	`}`
`102`	`102`	`// originalLimit set but originalRequest not set - K8s will treat the pod as if they were equal`
`103`	`103`	`if originalRequest == nil \|\| originalRequest.Value() == 0 {`