fix bugs of yurctl #317
Merged
fix bugs of yurctl #317
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Peeknut
force-pushed
the
fix
branch
2 times, most recently
from
246662c to
4d7846b
Compare
Do the following test1.Compile the image locally on node:
|
Peeknut
force-pushed
the
fix
branch
2 times, most recently
from
e50871c to
1aaf167
Compare
rambohe-ch
reviewed
May 25, 2021
pkg/yurtctl/cmd/convert/edgenode.go
Outdated
| @@ -242,7 +240,8 @@ func (c *ConvertEdgeNodeOptions) RunConvertEdgeNode() (err error) { | |||
| klog.Errorf("fail to run ServantJobs: %s", err) | |||
| return err | |||
| } | |||
| } else { | |||
| } else if len(c.EdgeNodes) == 0 || (len(c.EdgeNodes) == 1 && c.EdgeNodes[0] == nodeName) { | |||
There was a problem hiding this comment.
how about add nodeName != "" for len(c.EdgeNodes) == 0 condition?
rambohe-ch
reviewed
May 25, 2021
pkg/yurtctl/cmd/convert/edgenode.go
Outdated
| @@ -269,22 +266,44 @@ func (c *ConvertEdgeNodeOptions) RunConvertEdgeNode() (err error) { | |||
| if err != nil { | |||
There was a problem hiding this comment.
how about move c.KubeadmConfPath and c.PodMainfestPath parameter check and joinToken creation before LabelNode? so convert can fail fast if any error happened
rambohe-ch
reviewed
May 25, 2021
pkg/yurtctl/cmd/revert/edgenode.go
Outdated
| @@ -193,7 +193,8 @@ func (r *RevertEdgeNodeOptions) RunRevertEdgeNode() (err error) { | |||
| klog.Errorf("fail to revert edge node: %s", err) | |||
| return err | |||
| } | |||
| } else { | |||
| } else if len(r.EdgeNodes) == 0 || (len(r.EdgeNodes) == 1 && r.EdgeNodes[0] == nodeName) { | |||
There was a problem hiding this comment.
how about add nodeName != "" for len(c.EdgeNodes) == 0 condition?
rambohe-ch
reviewed
May 25, 2021
pkg/yurtctl/cmd/revert/edgenode.go
Outdated
| } | ||
| klog.Info("label openyurt.io/is-edge-worker is removed") | ||
| defer func() { |
There was a problem hiding this comment.
how about move remove edge label routine to the end of RunRevertEdgeNode func and after RevertKubelet and RemoveYurthub . because we should try to keep the reverse order of RunConvertEdgeNode. at the same time, rollback routine will not be needed.
|
/kind bug |
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Peeknut, rambohe-ch The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR does
fix bugs of yurtctl:
--kubeadm-conf-pathⅡ. Does this pull request fix one issue?
Ⅲ. List the added test cases (unit test/integration test) if any, please explain if no tests are needed.
Ⅳ. Describe how to verify it
NOTE: After yurtctl is modified, you need to recompile the yurtctl servant image and use it yourself, because the default image of servant-convert/revert-job is out of date after modify it.
Ⅴ. Special notes for reviews