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

Add Dialer Factory

Browse Source
This commit is contained in:
galal-hussein
2017-12-16 05:38:15 +02:00
parent 550df97a99
commit fd47cdc80d
10 changed files with 102 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/remove.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/rancher/rke/cluster"
"github.com/rancher/rke/hosts"
"github.com/rancher/types/apis/management.cattle.io/v3"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
@@ -33,9 +34,9 @@ func RemoveCommand() cli.Command {
}
}
func ClusterRemove(clusterFile string, customDialer hosts.Dialer) error {
func ClusterRemove(rkeConfig *v3.RancherKubernetesEngineConfig, dialerFactory hosts.DialerFactory) error {
logrus.Infof("Tearing down Kubernetes cluster")
kubeCluster, err := cluster.ParseConfig(clusterFile, customDialer)
kubeCluster, err := cluster.ParseCluster(rkeConfig, clusterFilePath, dialerFactory)
if err != nil {
return err
}
@@ -69,9 +70,15 @@ func clusterRemoveFromCli(ctx *cli.Context) error {
return nil
}
}
clusterFile, err := resolveClusterFile(ctx)
clusterFile, filePath, err := resolveClusterFile(ctx)
if err != nil {
return fmt.Errorf("Failed to resolve cluster file: %v", err)
}
return ClusterRemove(clusterFile, nil)
clusterFilePath = filePath
rkeConfig, err := cluster.ParseConfig(clusterFile)
if err != nil {
return fmt.Errorf("Failed to parse cluster file: %v", err)
}
return ClusterRemove(rkeConfig, nil)
}