Merge pull request #3903 from Ladicle/vpa-fix-limit-patch

Do not set limits when recommendation is 0
kubernetes · Mar 16, 2021 · b2951aa · b2951aa
2 parents 5d05268 + 237757a
commit b2951aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
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
@@ -70,6 +70,10 @@ func getProportionalResourceLimit(resourceName core.ResourceName, originalLimit,
 	if originalLimit == nil || originalLimit.Value() == 0 {
 		return nil, ""
 	}
+	// recommendedRequest not set, don't set limit.
+	if recommendedRequest == nil || recommendedRequest.Value() == 0 {
+		return nil, ""
+	}
 	// originalLimit set but originalRequest not set - K8s will treat the pod as if they were equal,
 	// recommend limit equal to request
 	if originalRequest == nil || originalRequest.Value() == 0 {

diff --git a/vertical-pod-autoscaler/pkg/utils/vpa/limit_and_request_scaling_test.go b/vertical-pod-autoscaler/pkg/utils/vpa/limit_and_request_scaling_test.go
@@ -67,6 +67,13 @@ func TestGetProportionalResourceLimit(t *testing.T) {
 			recommendedRequest: mustParseToPointer("10"),
 			expectLimit:        mustParseToPointer("10"),
 		},
+		{
+			name:               "no recommendation",
+			originalRequest:    mustParseToPointer("1"),
+			recommendedRequest: mustParseToPointer("0"),
+			defaultLimit:       mustParseToPointer("2"),
+			expectLimit:        nil,
+		},
 		{
 			name:               "limit equal to request",
 			originalLimit:      mustParseToPointer("1"),