Merge pull request #253 from chengxiangdong/fix

k8s-ci-robot · web-flow · commit 1288de84b94c · 2024-08-19T18:16:27.000-07:00
fix the issue that the node cannot be removed after ECS is deleted
diff --git a/pkg/cloudprovider/huaweicloud/wrapper/ecs.go b/pkg/cloudprovider/huaweicloud/wrapper/ecs.go
@@ -78,8 +78,9 @@ func (e *EcsClient) GetByNodeName(name string) (*model.ServerDetail, error) {
 		return nil, err
 	}
 
-	notFound := fmt.Errorf("not found any ECS, node: %s, PrivateIP: %s", name, privateIP)
+	notFound := status.Errorf(codes.NotFound, "not found any ECS, node: %s, PrivateIP: %s", name, privateIP)
 	if rsp.Servers == nil || len(*rsp.Servers) == 0 {
+		klog.Errorf("not found any ECS, node: %s, PrivateIP: %s", name, privateIP)
 		return nil, notFound
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,9 @@ func (e EcsClient) GetByNodeName(name string) (model.ServerDetail, error) {`
`78`	`78`	`return nil, err`
`79`	`79`	`}`
`80`	`80`
`81`		`- notFound := fmt.Errorf("not found any ECS, node: %s, PrivateIP: %s", name, privateIP)`
	`81`	`+ notFound := status.Errorf(codes.NotFound, "not found any ECS, node: %s, PrivateIP: %s", name, privateIP)`
`82`	`82`	`if rsp.Servers == nil \|\| len(*rsp.Servers) == 0 {`
	`83`	`+ klog.Errorf("not found any ECS, node: %s, PrivateIP: %s", name, privateIP)`
`83`	`84`	`return nil, notFound`
`84`	`85`	`}`
`85`	`86`