summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2023-11-27 20:05:41 +0800
committerGitHub <noreply@github.com>2023-11-27 20:05:41 +0800
commit18b010a780af445a1ae9257052ac9ecd5bb13614 (patch)
treef3f21531f5f7c735de140f7547f2258a247dde0b
parentMerge pull request #5179 from WillardHu/fix-copyresource (diff)
parentFix error logs for nodegroupx (diff)
downloadkubeedge-18b010a780af445a1ae9257052ac9ecd5bb13614.tar.gz
Merge pull request #5210 from Onion-of-dreamed/automated-cherry-pick-of-#5107-upstream-release-1.12
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 a09692f7f..30e2568a1 100644
--- a/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
+++ b/cloud/pkg/controllermanager/nodegroup/nodegroupcontroller.go
@@ -357,7 +357,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