rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 15:06:23 +00:00
Code Issues Releases Wiki Activity

make cluster.yml optional in --local

Browse Source
This commit is contained in:
galal-hussein
2018-01-15 06:36:28 +02:00
parent 8ea54f573f
commit 447eb6a479
4 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/remove.go
View File

@@ -68,7 +68,6 @@ func ClusterRemove(
}
func clusterRemoveFromCli(ctx *cli.Context) error {
var local bool
force := ctx.Bool("force")
if !force {
reader := bufio.NewReader(os.Stdin)
@@ -82,6 +81,9 @@ func clusterRemoveFromCli(ctx *cli.Context) error {
return nil
}
}
if ctx.Bool("local") {
return clusterRemoveLocal(ctx)
}
clusterFile, filePath, err := resolveClusterFile(ctx)
if err != nil {
return fmt.Errorf("Failed to resolve cluster file: %v", err)
@@ -91,9 +93,11 @@ func clusterRemoveFromCli(ctx *cli.Context) error {
if err != nil {
return fmt.Errorf("Failed to parse cluster file: %v", err)
}
if ctx.Bool("local") {
rkeConfig.Nodes = []v3.RKEConfigNode{*cluster.GetLocalRKENodeConfig()}
local = true
}
return ClusterRemove(context.Background(), rkeConfig, nil, local, "")
return ClusterRemove(context.Background(), rkeConfig, nil, false, "")
}
func clusterRemoveLocal(ctx *cli.Context) error {
var rkeConfig *v3.RancherKubernetesEngineConfig
rkeConfig = cluster.GetLocalRKEConfig()
return ClusterRemove(context.Background(), rkeConfig, nil, true, "")
}