Merge pull request kubernetes#7500 from k8s-infra-cherrypick-robot/ch…

…erry-pick-7379-to-cluster-autoscaler-release-1.29 [cluster-autoscaler-release-1.29] Remove obsolete upper bound check
DataDog · Nov 15, 2024 · 204a4a7 · 204a4a7
2 parents a81f78a + 999d052
commit 204a4a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/cluster-autoscaler/cloudprovider/ionoscloud/ionoscloud_cloud_provider.go b/cluster-autoscaler/cloudprovider/ionoscloud/ionoscloud_cloud_provider.go
@@ -71,14 +71,11 @@ func (n *nodePool) IncreaseSize(delta int) error {
 	if delta <= 0 {
 		return errors.New("size increase must be positive")
 	}
-	size, err := n.manager.GetNodeGroupSize(n)
+	size, err := n.manager.GetNodeGroupTargetSize(n)
 	if err != nil {
 		return err
 	}
 	targetSize := size + delta
-	if targetSize > n.max {
-		return fmt.Errorf("size increase exceeds upper bound of %d", n.max)
-	}
 	return n.manager.SetNodeGroupSize(n, targetSize)
 }
 

diff --git a/cluster-autoscaler/cloudprovider/ionoscloud/ionoscloud_cloud_provider_test.go b/cluster-autoscaler/cloudprovider/ionoscloud/ionoscloud_cloud_provider_test.go
@@ -113,23 +113,18 @@ func (s *NodeGroupTestSuite) TestIncreaseSize_InvalidDelta() {
 }
 
 func (s *NodeGroupTestSuite) TestIncreaseSize_GetSizeError() {
-	s.manager.On("GetNodeGroupSize", s.nodePool).Return(0, errors.New("error")).Once()
-	s.Error(s.nodePool.IncreaseSize(2))
-}
-
-func (s *NodeGroupTestSuite) TestIncreaseSize_ExceedMax() {
-	s.manager.On("GetNodeGroupSize", s.nodePool).Return(2, nil).Once()
+	s.manager.On("GetNodeGroupTargetSize", s.nodePool).Return(0, errors.New("error")).Once()
 	s.Error(s.nodePool.IncreaseSize(2))
 }
 
 func (s *NodeGroupTestSuite) TestIncreaseSize_SetSizeError() {
-	s.manager.On("GetNodeGroupSize", s.nodePool).Return(2, nil).Once()
+	s.manager.On("GetNodeGroupTargetSize", s.nodePool).Return(2, nil).Once()
 	s.manager.On("SetNodeGroupSize", s.nodePool, 3).Return(errors.New("error")).Once()
 	s.Error(s.nodePool.IncreaseSize(1))
 }
 
 func (s *NodeGroupTestSuite) TestIncreaseSize_OK() {
-	s.manager.On("GetNodeGroupSize", s.nodePool).Return(2, nil).Once()
+	s.manager.On("GetNodeGroupTargetSize", s.nodePool).Return(2, nil).Once()
 	s.manager.On("SetNodeGroupSize", s.nodePool, 3).Return(nil).Once()
 	s.NoError(s.nodePool.IncreaseSize(1))
 }