From 197683f347289dd8efd1b29f0aa320fbdcd0af20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Banaszewski?= Date: Tue, 25 Oct 2022 13:19:37 +0000 Subject: [PATCH] Fixed ConcurrentNodeSyncs option validation --- .../src/k8s.io/cloud-provider/options/nodecontroller.go | 2 +- .../k8s.io/cloud-provider/options/nodecontroller_test.go | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/cloud-provider/options/nodecontroller.go b/staging/src/k8s.io/cloud-provider/options/nodecontroller.go index 953e549e615..4823c437b16 100644 --- a/staging/src/k8s.io/cloud-provider/options/nodecontroller.go +++ b/staging/src/k8s.io/cloud-provider/options/nodecontroller.go @@ -55,7 +55,7 @@ func (o *NodeControllerOptions) Validate() []error { return nil } var errors []error - if o.ConcurrentNodeSyncs < 0 { + if o.ConcurrentNodeSyncs <= 0 { errors = append(errors, fmt.Errorf("concurrent-node-syncs must be a positive number")) } return errors diff --git a/staging/src/k8s.io/cloud-provider/options/nodecontroller_test.go b/staging/src/k8s.io/cloud-provider/options/nodecontroller_test.go index 350b10c48b4..6c024a9dabe 100644 --- a/staging/src/k8s.io/cloud-provider/options/nodecontroller_test.go +++ b/staging/src/k8s.io/cloud-provider/options/nodecontroller_test.go @@ -47,11 +47,12 @@ func TestNodeControllerConcurrentNodeSyncsValidation(t *testing.T) { { desc: "negative value", input: &NodeControllerOptions{NodeControllerConfiguration: &nodeconfig.NodeControllerConfiguration{ConcurrentNodeSyncs: -5}}, - expect: []error{fmt.Errorf("node-controller-concurrent-node-syncs must be a positive number")}, + expect: []error{fmt.Errorf("concurrent-node-syncs must be a positive number")}, }, { - desc: "non negative value", - input: &NodeControllerOptions{NodeControllerConfiguration: &nodeconfig.NodeControllerConfiguration{ConcurrentNodeSyncs: 0}}, + desc: "zero value", + input: &NodeControllerOptions{NodeControllerConfiguration: &nodeconfig.NodeControllerConfiguration{ConcurrentNodeSyncs: 0}}, + expect: []error{fmt.Errorf("concurrent-node-syncs must be a positive number")}, }, { desc: "positive value",