add kcctl conection port configurable #207
Merged
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
Signed-off-by: Liucw <liu.chuwei@99cloud.net>
kubeclipper-bot
added
kind/feature
Signed-off-by: Liucw <liu.chuwei@99cloud.net>
x893675
reviewed
Sep 10, 2022
cmd/kcctl/app/options/options.go
Outdated
| @@ -65,6 +65,7 @@ const ( | |||
| DefaultDeployConfig = "deploy-config.yaml" | |||
| DefaultConfig = "config" | |||
| DefaultCaPath = "pki" | |||
| DefaultSSHPort = 22 | |||
x893675
reviewed
Sep 10, 2022
cmd/kcctl/app/options/options.go
Outdated
| @@ -268,6 +269,7 @@ func NewDeployOptions() *DeployConfig { | |||
| IPDetect: autodetection.MethodFirst, | |||
| SSHConfig: &sshutils.SSH{ | |||
| User: "root", | |||
| Port: DefaultSSHPort, | |||
x893675
reviewed
Sep 10, 2022
cmd/kcctl/app/options/options.go
Outdated
| if c.Config == "" { | ||
| return nil | ||
| } | ||
|
|
||
| if c.SSHConfig.Port != DefaultSSHPort { |
x893675
reviewed
Sep 10, 2022
cmd/kcctl/app/options/options.go
Outdated
| @@ -308,9 +310,15 @@ func (c *DeployConfig) MergeDeployOptions() { | |||
| } | |||
|
|
|||
| func (c *DeployConfig) Complete() error { | |||
| port := 0 | |||
There was a problem hiding this comment.
unnessasery, just check port > 0 in func ValidateArgs
x893675
reviewed
Sep 10, 2022
cmd/kcctl/app/options/options.go
Outdated
| @@ -338,6 +346,12 @@ func (c *DeployConfig) Complete() error { | |||
| } | |||
| } | |||
|
|
|||
| if port != 0 { | |||
| c.SSHConfig.Port = port | |||
| } else if c.SSHConfig.Port == 0 { | |||
Signed-off-by: Liucw <liu.chuwei@99cloud.net>
kubeclipper-bot
added
size/XS
|
/cc @lixd |
|
LGTM label has been added. Git tree hash: 1b847426d669ac6e5cfddcd6c7dcb79b0cfd8261
|
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lixd, Metrora, x893675 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 |
kubeclipper-bot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Signed-off-by: Liucw liu.chuwei@99cloud.net
What type of PR is this?
/kind feature
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #191
Special notes for reviewers:
Does this PR introduced a user-facing change?
Additional documentation, usage docs, etc.:
@x893675