feature: gameworkload rollout (#2697)

* gameworkload rollout * patchType 修改 * 代码规范修改
TencentBlueKing · Oct 23, 2023 · c8bd99a · c8bd99a
1 parent 3e53028
commit c8bd99a
Show file tree

Hide file tree

Showing 36 changed files with 11,247 additions and 8,304 deletions.
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/tasks/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/ladder/tasks/utils.go
@@ -16,9 +16,9 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
 	"github.com/avast/retry-go"
 
-	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/node.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/node.go
@@ -4,12 +4,13 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+// Package business xxx
 package business
 
 import (
@@ -20,14 +21,14 @@ import (
 	"sync"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/remote/cmdb"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
-
-	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
 // GetCVMImageIDByImageName get image info by image name

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/tke.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/tke.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/types.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business/types.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,6 +16,7 @@ import (
 	"strings"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/nodemgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/nodemgr.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,6 +20,7 @@ import (
 	"sync"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/tasks/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/tasks/utils.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
 	"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
+
 	cmproto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/business"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/utils.go
@@ -42,9 +42,9 @@ const (
 	// tkeCleanNodeTaskTemplate bk-sops add task template
 	tkeCleanNodeTaskTemplate = "tke-remove node: %s"
 	// tkeAddExternalNodeTaskTemplate bk-sops add task template
-	tkeAddExternalNodeTaskTemplate = "tke-add external node: %s"
+	tkeAddExternalNodeTaskTemplate = "tke-add external node: %s" // nolint
 	// tkeCleanExternalNodeTaskTemplate bk-sops add task template
-	tkeCleanExternalNodeTaskTemplate = "tke-remove external node: %s"
+	tkeCleanExternalNodeTaskTemplate = "tke-remove external node: %s" // nolint
 	// importClusterTaskTemplate bk-sops add task template
 	importClusterTaskTemplate = "tke-import cluster: %s"
 	// createNodeGroupTaskTemplate bk-sops add task template

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/vpcmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud-public/vpcmgr.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/node.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/node.go
@@ -16,12 +16,12 @@ import (
 	"fmt"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
-
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
 )
 
 // GetCVMClient get cvm client from common option

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/tag.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/tag.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -14,11 +14,11 @@ package api
 
 import (
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
-
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	tag "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tag/v20180813"
+
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 )
 
 const (

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/utils.go
@@ -26,8 +26,6 @@ import (
 
 const (
 	limit = 100
-
-	maxFilterValues = 5
 )
 
 // FilterKey tke interface filterKey

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/vpc.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api/vpc.go
@@ -18,12 +18,12 @@ import (
 	"strconv"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
-	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
-
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
 )
 
 // NewVPCClient init VPC client
@@ -48,6 +48,7 @@ func NewVPCClient(opt *cloudprovider.CommonOption) (*VpcClient, error) {
 	return &VpcClient{client: cli}, nil
 }
 
+// VpcClient xxx
 type VpcClient struct {
 	client *vpc.Client
 }
@@ -275,7 +276,7 @@ func (v *VpcClient) CheckAssistantCidr(vpcId string, news []string, olds []strin
 	req := vpc.NewCheckAssistantCidrRequest()
 	req.VpcId = common.StringPtr(vpcId)
 	req.NewCidrBlocks = common.StringPtrs(news)
-	//req.OldCidrBlocks = common.StringPtrs(olds)
+	// req.OldCidrBlocks = common.StringPtrs(olds)
 
 	resp, err := v.client.CheckAssistantCidr(req)
 	if err != nil {

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/network.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/network.go
@@ -4,24 +4,25 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+// Package business xxx
 package business
 
 import (
 	"fmt"
 	"net"
 
+	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
+
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/remote/cidrtree"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
-
-	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 )
 
 // GetVpcCIDRBlocks 获取vpc所属的cidr段

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/network_test.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/network_test.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -38,4 +38,4 @@ func TestAllocateSubnet(t *testing.T) {
 	}
 
 	t.Log(sub)
-}
+}
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/node.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/node.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,14 +20,14 @@ import (
 	"sync"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/remote/cmdb"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
-
-	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
 // GetCVMImageIDByImageName get image info by image name

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/tke.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/tke.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/types.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business/types.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -16,6 +16,7 @@ import (
 	"strings"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/nodemgr.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -20,6 +20,7 @@ import (
 	"sync"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
+
 	proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/api"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/tasks/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/tasks/utils.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
 	"github.com/Tencent/bk-bcs/bcs-common/pkg/odm/drivers"
+
 	cmproto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/business"

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/vpcmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/qcloud/vpcmgr.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.

diff --git a/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/cidr.go b/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/cidr.go
@@ -4,12 +4,13 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+// Package cidrtree xxx
 package cidrtree
 
 import (
@@ -20,6 +21,7 @@ import (
 	"github.com/pkg/errors"
 )
 
+// ErrNoEnoughFreeSubnet xxx
 var ErrNoEnoughFreeSubnet = errors.New("no enough free subnet")
 
 // Mananger define interface to manage cidr
@@ -40,10 +42,14 @@ func NewCidrManager(cidrBlock *net.IPNet, subnets []*net.IPNet) Mananger {
 }
 
 const (
+	// NODE_UNUSED unused
 	NODE_UNUSED byte = 0
-	NODE_USED   byte = 1
-	NODE_SPLIT  byte = 2
-	NODE_FULL   byte = 3
+	// NODE_USED use
+	NODE_USED byte = 1
+	// NODE_SPLIT split
+	NODE_SPLIT byte = 2
+	// NODE_FULL fill
+	NODE_FULL byte = 3 // nolint
 )
 
 type node struct {

diff --git a/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/cidr_test.go b/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/cidr_test.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
@@ -13,10 +13,9 @@
 package cidrtree
 
 import (
-	"testing"
-
 	"fmt"
 	"net"
+	"testing"
 )
 
 func TestNewCidrManager(t *testing.T) {

diff --git a/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/interface.go b/bcs-services/bcs-cluster-manager/internal/remote/cidrtree/interface.go
@@ -4,7 +4,7 @@
  * Licensed under the MIT License (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under,
+ * Unless required by applicable law or agreed to in writing, software distributed under
  * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
  * either express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,8 +26,6 @@ import ( @@
     const (
     	limit = 100
-    	maxFilterValues = 5
     )
     // FilterKey tke interface filterKey
@@ Expand Down @@