summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2023-11-27 20:00:41 +0800
committerGitHub <noreply@github.com>2023-11-27 20:00:41 +0800
commitcfd074f635269eb38b2edb113dc21fa3109ce8ac (patch)
tree67532215650c90154ac1c88f5988ef6f78dcfac4
parentMerge pull request #5192 from Shelley-BaoYue/automated-cherry-pick-of-#5144-u... (diff)
parentFix error logs for nodegroupx (diff)
downloadkubeedge-cfd074f635269eb38b2edb113dc21fa3109ce8ac.tar.gz
Merge pull request #5212 from Onion-of-dreamed/automated-cherry-pick-of-#5107-upstream-release-1.14
Automated cherry pick of #5107: Fix error logs for nodegroupx
-rw-r--r--cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go b/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
index 212ff4208..ac83d45cf 100644
--- a/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
+++ b/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
@@ -356,7 +356,7 @@ func (c *Controller) addOrUpdateNodeLabel(ctx context.Context, node *corev1.Node
return nil
}
if ok && v != nodeGroupName {
- return fmt.Errorf("node %s has already belonged to NodeGroup %s", node.Name, nodeGroupName)
+ return fmt.Errorf("node %s has already belonged to NodeGroup %s", node.Name, v)
}
// !ok