Merge pull request #7973 from jincong8973/master

feat: add ignoreDaemonSetsUtilization and zeroOrMaxNodeScaling to NodeGroupAutoscalingOptions

Author: k8s-ci-robot

cluster-autoscaler/cloudprovider/externalgrpc/README.md

@@ -61,7 +61,12 @@ go install google.golang.org/protobuf/cmd/[email protected]
 go install google.golang.org/grpc/cmd/[email protected]
 ```
 
-2. generate gRPC client and server code:
+2. import proto dependencies using go modules
+```bash
+go mod vendor 
+```
+
+3. generate gRPC client and server code:
 
 ```bash
 protoc \

cluster-autoscaler/cloudprovider/externalgrpc/examples/external-grpc-cloud-provider-service/wrapper/wrapper.go

@@ -103,7 +103,7 @@ func (w *Wrapper) NodeGroupForNode(_ context.Context, req *protos.NodeGroupForNo
 	// Checks if ng is nil interface or contains nil value
 	if ng == nil || reflect.ValueOf(ng).IsNil() {
 		return &protos.NodeGroupForNodeResponse{
-			NodeGroup: &protos.NodeGroup{}, //NodeGroup with id = "", meaning the node should not be processed by cluster autoscaler
+			NodeGroup: &protos.NodeGroup{}, // NodeGroup with id = "", meaning the node should not be processed by cluster autoscaler
 		}, nil
 	}
 	return &protos.NodeGroupForNodeResponse{
@@ -365,6 +365,8 @@ func (w *Wrapper) NodeGroupGetOptions(_ context.Context, req *protos.NodeGroupAu
 		ScaleDownUnneededTime:            pbDefaults.GetScaleDownUnneededTime().Duration,
 		ScaleDownUnreadyTime:             pbDefaults.GetScaleDownUnneededTime().Duration,
 		MaxNodeProvisionTime:             pbDefaults.GetMaxNodeProvisionTime().Duration,
+		ZeroOrMaxNodeScaling:             pbDefaults.GetZeroOrMaxNodeScaling(),
+		IgnoreDaemonSetsUtilization:      pbDefaults.GetIgnoreDaemonSetsUtilization(),
 	}
 	opts, err := ng.GetOptions(defaults)
 	if err != nil {
@@ -374,7 +376,7 @@ func (w *Wrapper) NodeGroupGetOptions(_ context.Context, req *protos.NodeGroupAu
 		return nil, err
 	}
 	if opts == nil {
-		return nil, fmt.Errorf("GetOptions not implemented") //make this explicitly so that grpc response is discarded
+		return nil, fmt.Errorf("GetOptions not implemented") // make this explicitly so that grpc response is discarded
 	}
 	return &protos.NodeGroupAutoscalingOptionsResponse{
 		NodeGroupAutoscalingOptions: &protos.NodeGroupAutoscalingOptions{
@@ -389,6 +391,8 @@ func (w *Wrapper) NodeGroupGetOptions(_ context.Context, req *protos.NodeGroupAu
 			MaxNodeProvisionTime: &metav1.Duration{
 				Duration: opts.MaxNodeProvisionTime,
 			},
+			ZeroOrMaxNodeScaling:        opts.ZeroOrMaxNodeScaling,
+			IgnoreDaemonSetsUtilization: opts.IgnoreDaemonSetsUtilization,
 		},
 	}, nil
 }

cluster-autoscaler/cloudprovider/externalgrpc/externalgrpc_node_group.go

@@ -283,6 +283,8 @@ func (n *NodeGroup) GetOptions(defaults config.NodeGroupAutoscalingOptions) (*co
 			MaxNodeProvisionTime: &metav1.Duration{
 				Duration: defaults.MaxNodeProvisionTime,
 			},
+			ZeroOrMaxNodeScaling:        defaults.ZeroOrMaxNodeScaling,
+			IgnoreDaemonSetsUtilization: defaults.IgnoreDaemonSetsUtilization,
 		},
 	})
 	if err != nil {
@@ -303,6 +305,8 @@ func (n *NodeGroup) GetOptions(defaults config.NodeGroupAutoscalingOptions) (*co
 		ScaleDownUnneededTime:            pbOpts.GetScaleDownUnneededTime().Duration,
 		ScaleDownUnreadyTime:             pbOpts.GetScaleDownUnreadyTime().Duration,
 		MaxNodeProvisionTime:             pbOpts.GetMaxNodeProvisionTime().Duration,
+		ZeroOrMaxNodeScaling:             pbOpts.GetZeroOrMaxNodeScaling(),
+		IgnoreDaemonSetsUtilization:      pbOpts.GetIgnoreDaemonSetsUtilization(),
 	}
 	return opts, nil
 }

cluster-autoscaler/cloudprovider/externalgrpc/externalgrpc_node_group_test.go

@@ -244,7 +244,7 @@ func TestCloudProvider_GetOptions(t *testing.T) {
 	client, m, teardown := setupTest(t)
 	defer teardown()
 
-	// test correct call
+	// test correct call, NodeGroupAutoscalingOptionsResponse will override default options
 	m.On(
 		"NodeGroupGetOptions", mock.Anything, mock.MatchedBy(func(req *protos.NodeGroupAutoscalingOptionsRequest) bool {
 			return req.Id == "nodeGroup1"
@@ -257,6 +257,8 @@ func TestCloudProvider_GetOptions(t *testing.T) {
 				ScaleDownUnneededTime:            &v1.Duration{Duration: time.Minute},
 				ScaleDownUnreadyTime:             &v1.Duration{Duration: time.Hour},
 				MaxNodeProvisionTime:             &v1.Duration{Duration: time.Minute},
+				ZeroOrMaxNodeScaling:             true,
+				IgnoreDaemonSetsUtilization:      true,
 			},
 		},
 		nil,
@@ -267,12 +269,15 @@ func TestCloudProvider_GetOptions(t *testing.T) {
 		client:      client,
 		grpcTimeout: defaultGRPCTimeout,
 	}
+
 	defaultsOpts := config.NodeGroupAutoscalingOptions{
 		ScaleDownUtilizationThreshold:    0.6,
 		ScaleDownGpuUtilizationThreshold: 0.7,
 		ScaleDownUnneededTime:            time.Minute,
 		ScaleDownUnreadyTime:             time.Hour,
 		MaxNodeProvisionTime:             time.Minute,
+		ZeroOrMaxNodeScaling:             false,
+		IgnoreDaemonSetsUtilization:      false,
 	}
 
 	opts, err := ng1.GetOptions(defaultsOpts)
@@ -282,16 +287,20 @@ func TestCloudProvider_GetOptions(t *testing.T) {
 	assert.Equal(t, time.Minute, opts.ScaleDownUnneededTime)
 	assert.Equal(t, time.Hour, opts.ScaleDownUnreadyTime)
 	assert.Equal(t, time.Minute, opts.MaxNodeProvisionTime)
+	assert.Equal(t, true, opts.ZeroOrMaxNodeScaling)
+	assert.Equal(t, true, opts.IgnoreDaemonSetsUtilization)
 
 	// test grpc error
 	m.On(
 		"NodeGroupGetOptions", mock.Anything, mock.MatchedBy(func(req *protos.NodeGroupAutoscalingOptionsRequest) bool {
 			return req.Id == "nodeGroup2"
 		}),
 	).Return(
-		&protos.NodeGroupAutoscalingOptionsResponse{},
+		&protos.NodeGroupAutoscalingOptionsResponse{
+			NodeGroupAutoscalingOptions: &protos.NodeGroupAutoscalingOptions{},
+		},
 		fmt.Errorf("mock error"),
-	)
+	).Once()
 
 	ng2 := NodeGroup{
 		id:          "nodeGroup2",
@@ -343,6 +352,40 @@ func TestCloudProvider_GetOptions(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, cloudprovider.ErrNotImplemented, err)
 
+	// test with default options
+	m.On(
+		"NodeGroupGetOptions", mock.Anything, mock.MatchedBy(func(req *protos.NodeGroupAutoscalingOptionsRequest) bool {
+			return req.Id == "nodeGroup5"
+		}),
+	).Return(
+		&protos.NodeGroupAutoscalingOptionsResponse{
+			NodeGroupAutoscalingOptions: &protos.NodeGroupAutoscalingOptions{
+				ScaleDownUtilizationThreshold:    0.6,
+				ScaleDownGpuUtilizationThreshold: 0.7,
+				ScaleDownUnneededTime:            &v1.Duration{Duration: time.Minute},
+				ScaleDownUnreadyTime:             &v1.Duration{Duration: time.Hour},
+				MaxNodeProvisionTime:             &v1.Duration{Duration: time.Minute},
+			},
+		},
+		nil,
+	)
+
+	ng5 := NodeGroup{
+		id:          "nodeGroup5",
+		client:      client,
+		grpcTimeout: defaultGRPCTimeout,
+	}
+
+	opts, err = ng5.GetOptions(defaultsOpts)
+	assert.NoError(t, err)
+	assert.Equal(t, 0.6, opts.ScaleDownUtilizationThreshold)
+	assert.Equal(t, 0.7, opts.ScaleDownGpuUtilizationThreshold)
+	assert.Equal(t, time.Minute, opts.ScaleDownUnneededTime)
+	assert.Equal(t, time.Hour, opts.ScaleDownUnreadyTime)
+	assert.Equal(t, time.Minute, opts.MaxNodeProvisionTime)
+	assert.Equal(t, false, opts.ZeroOrMaxNodeScaling)
+	assert.Equal(t, false, opts.IgnoreDaemonSetsUtilization)
+
 }
 
 func TestCloudProvider_TargetSize(t *testing.T) {