mirror of
https://github.com/rancher/rke.git
synced 2025-07-31 22:56:19 +00:00
Added flag to ignore docker version
This commit is contained in:
parent
db3bda1191
commit
73e56b0fbb
@ -10,11 +10,15 @@ import (
|
||||
"github.com/urfave/cli"
|
||||
)
|
||||
|
||||
var sshCliOptions = []cli.Flag{
|
||||
var commonFlags = []cli.Flag{
|
||||
cli.BoolFlag{
|
||||
Name: "ssh-agent-auth",
|
||||
Usage: "Use SSH Agent Auth defined by SSH_AUTH_SOCK",
|
||||
},
|
||||
cli.BoolFlag{
|
||||
Name: "ignore-docker-version",
|
||||
Usage: "Disable Docker version check",
|
||||
},
|
||||
}
|
||||
|
||||
func resolveClusterFile(ctx *cli.Context) (string, string, error) {
|
||||
@ -41,5 +45,10 @@ func setOptionsFromCLI(c *cli.Context, rkeConfig *v3.RancherKubernetesEngineConf
|
||||
if c.Bool("ssh-agent-auth") {
|
||||
rkeConfig.SSHAgentAuth = c.Bool("ssh-agent-auth")
|
||||
}
|
||||
|
||||
if c.Bool("ignore-docker-version") {
|
||||
rkeConfig.IgnoreDockerVersion = c.Bool("ignore-docker-version")
|
||||
}
|
||||
|
||||
return rkeConfig, nil
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ func EtcdCommand() cli.Command {
|
||||
},
|
||||
}
|
||||
|
||||
backupRestoreFlags = append(backupRestoreFlags, sshCliOptions...)
|
||||
backupRestoreFlags = append(backupRestoreFlags, commonFlags...)
|
||||
|
||||
return cli.Command{
|
||||
Name: "etcd",
|
||||
|
@ -35,7 +35,7 @@ func RemoveCommand() cli.Command {
|
||||
},
|
||||
}
|
||||
|
||||
removeFlags = append(removeFlags, sshCliOptions...)
|
||||
removeFlags = append(removeFlags, commonFlags...)
|
||||
|
||||
return cli.Command{
|
||||
Name: "remove",
|
||||
|
@ -39,7 +39,7 @@ func UpCommand() cli.Command {
|
||||
},
|
||||
}
|
||||
|
||||
upFlags = append(upFlags, sshCliOptions...)
|
||||
upFlags = append(upFlags, commonFlags...)
|
||||
|
||||
return cli.Command{
|
||||
Name: "up",
|
||||
@ -199,6 +199,9 @@ func clusterUpLocal(ctx *cli.Context) error {
|
||||
}
|
||||
rkeConfig.Nodes = []v3.RKEConfigNode{*cluster.GetLocalRKENodeConfig()}
|
||||
}
|
||||
|
||||
rkeConfig.IgnoreDockerVersion = ctx.Bool("ignore-docker-version")
|
||||
|
||||
_, _, _, _, _, err = ClusterUp(context.Background(), rkeConfig, nil, hosts.LocalHealthcheckFactory, nil, true, "", false, false)
|
||||
return err
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user