Skip to content

Commit

Permalink
fix --ignore-config-check not working for deploy (#1774)
Browse files Browse the repository at this point in the history
  • Loading branch information
AstroProfundis committed Mar 10, 2022
1 parent 3c1d577 commit 5a577eb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion components/cluster/command/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func newDeploy() *cobra.Command {
cmd.Flags().BoolVarP(&opt.SkipCreateUser, "skip-create-user", "", false, "(EXPERIMENTAL) Skip creating the user specified in topology.")
cmd.Flags().StringVarP(&opt.IdentityFile, "identity_file", "i", opt.IdentityFile, "The path of the SSH identity file. If specified, public key authentication will be used.")
cmd.Flags().BoolVarP(&opt.UsePassword, "password", "p", false, "Use password of target hosts. If specified, password authentication will be used.")
cmd.Flags().BoolVarP(&opt.IgnoreConfigCheck, "ignore-config-check", "", opt.IgnoreConfigCheck, "Ignore the config check result")
cmd.Flags().BoolVarP(&gOpt.IgnoreConfigCheck, "ignore-config-check", "", false, "Ignore the config check result of components")
cmd.Flags().BoolVarP(&opt.NoLabels, "no-labels", "", false, "Don't check TiKV labels")

return cmd
Expand Down
7 changes: 4 additions & 3 deletions pkg/cluster/api/dmpb/dmmaster.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions pkg/cluster/api/dmpb/dmworker.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions pkg/cluster/manager/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ import (

// DeployOptions contains the options for scale out.
type DeployOptions struct {
User string // username to login to the SSH server
SkipCreateUser bool // don't create the user
IdentityFile string // path to the private key file
UsePassword bool // use password instead of identity file for ssh connection
IgnoreConfigCheck bool // ignore config check result
NoLabels bool // don't check labels for TiKV instance
Stage1 bool // don't start the new instance, just deploy
Stage2 bool // start instances and init Config after stage1
User string // username to login to the SSH server
SkipCreateUser bool // don't create the user
IdentityFile string // path to the private key file
UsePassword bool // use password instead of identity file for ssh connection
NoLabels bool // don't check labels for TiKV instance
Stage1 bool // don't start the new instance, just deploy
Stage2 bool // start instances and init Config after stage1
}

// DeployerInstance is a instance can deploy to a target deploy directory.
Expand Down

0 comments on commit 5a577eb

Please sign in to comment.