From f3931267a76232327ea7e47a6e24887ddff4ccd3 Mon Sep 17 00:00:00 2001 From: Marco Vito Moscaritolo Date: Wed, 15 Aug 2018 22:41:17 +0200 Subject: [PATCH] remove utils ProviderAndManager that create two unrelated object --- cmd/cluster_add_worker.go | 3 ++- cmd/cluster_addon.go | 2 +- cmd/cluster_addon_install.go | 2 +- cmd/cluster_addon_list.go | 2 +- cmd/cluster_addon_uninstall.go | 2 +- cmd/cluster_create_test.go | 3 ++- cmd/cluster_kubeconfig.go | 2 +- pkg/hetzner/util.go | 17 ----------------- 8 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 pkg/hetzner/util.go diff --git a/cmd/cluster_add_worker.go b/cmd/cluster_add_worker.go index 3213a38e..442cdca4 100644 --- a/cmd/cluster_add_worker.go +++ b/cmd/cluster_add_worker.go @@ -93,7 +93,8 @@ You can specify the worker server type as in cluster create.`, } coordinator := pkg.NewProgressCoordinator() - hetznerProvider, clusterManager := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, coordinator, AppConf.CurrentContext.Token) + hetznerProvider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) + clusterManager := clustermanager.NewClusterManagerFromCluster(*cluster, hetznerProvider, AppConf.SSHClient, coordinator) err := AppConf.SSHClient.(*clustermanager.SSHCommunicator).CapturePassphrase(sshKeyName) if err != nil { log.Fatal(err) diff --git a/cmd/cluster_addon.go b/cmd/cluster_addon.go index 8ada4bb7..ed873aef 100644 --- a/cmd/cluster_addon.go +++ b/cmd/cluster_addon.go @@ -55,7 +55,7 @@ func validateAddonSubCommand(cmd *cobra.Command, args []string) error { return errors.New("exactly one argument expected") } addonName := args[0] - provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token) + provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient) if !addonService.AddonExists(addonName) { return fmt.Errorf("addon %s not found", addonName) diff --git a/cmd/cluster_addon_install.go b/cmd/cluster_addon_install.go index e985cb47..6cff7f87 100644 --- a/cmd/cluster_addon_install.go +++ b/cmd/cluster_addon_install.go @@ -35,7 +35,7 @@ var clusterAddonInstallCmd = &cobra.Command{ _, cluster := AppConf.Config.FindClusterByName(name) log.Printf("installing addon %s", addonName) - provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token) + provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient) masterNode, err := provider.GetMasterNode() FatalOnError(err) diff --git a/cmd/cluster_addon_list.go b/cmd/cluster_addon_list.go index 1efc24ea..d3b19f38 100644 --- a/cmd/cluster_addon_list.go +++ b/cmd/cluster_addon_list.go @@ -36,7 +36,7 @@ var clusterAddonListCmd = &cobra.Command{ fmt.Fprintln(tw, "NAME\tREQUIRES\tDESCRIPTION\tURL") cluster := &clustermanager.Cluster{Nodes: []clustermanager.Node{clustermanager.Node{IsMaster: true}}} - provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token) + provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) addonService := addons.NewClusterAddonService(provider, AppConf.SSHClient) for _, addon := range addonService.Addons() { requires := "-" diff --git a/cmd/cluster_addon_uninstall.go b/cmd/cluster_addon_uninstall.go index 7481eded..78e9a115 100644 --- a/cmd/cluster_addon_uninstall.go +++ b/cmd/cluster_addon_uninstall.go @@ -35,7 +35,7 @@ var clusterAddonUninstallCmd = &cobra.Command{ _, cluster := AppConf.Config.FindClusterByName(name) log.Printf("removing addon %s", addonName) - provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token) + provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) masterNode, err := provider.GetMasterNode() FatalOnError(err) diff --git a/cmd/cluster_create_test.go b/cmd/cluster_create_test.go index 043fd4ca..3c38eb3d 100644 --- a/cmd/cluster_create_test.go +++ b/cmd/cluster_create_test.go @@ -1,8 +1,9 @@ package cmd import ( - "github.com/xetys/hetzner-kube/pkg/clustermanager" "testing" + + "github.com/xetys/hetzner-kube/pkg/clustermanager" ) func TestClusterCmdValidate(t *testing.T) { diff --git a/cmd/cluster_kubeconfig.go b/cmd/cluster_kubeconfig.go index 58a70694..a9cff7f7 100644 --- a/cmd/cluster_kubeconfig.go +++ b/cmd/cluster_kubeconfig.go @@ -46,7 +46,7 @@ Example 4: hetzner-kube cluster kubeconfig -n my-cluster -p > my-conf.yaml # pri name := args[0] _, cluster := AppConf.Config.FindClusterByName(name) - provider, _ := hetzner.ProviderAndManager(AppConf.Context, *cluster, AppConf.Client, AppConf.SSHClient, nil, AppConf.CurrentContext.Token) + provider := hetzner.NewHetznerProvider(AppConf.Context, AppConf.Client, *cluster, AppConf.CurrentContext.Token) masterNode, err := provider.GetMasterNode() FatalOnError(err) diff --git a/pkg/hetzner/util.go b/pkg/hetzner/util.go deleted file mode 100644 index 3b7e9c4b..00000000 --- a/pkg/hetzner/util.go +++ /dev/null @@ -1,17 +0,0 @@ -package hetzner - -import ( - "context" - - "github.com/hetznercloud/hcloud-go/hcloud" - "github.com/xetys/hetzner-kube/pkg/clustermanager" -) - -//ProviderAndManager get the provider and the manager for the cluster -func ProviderAndManager(context context.Context, cluster clustermanager.Cluster, client *hcloud.Client, nc clustermanager.NodeCommunicator, eventService clustermanager.EventService, token string) (*Provider, *clustermanager.Manager) { - provider := NewHetznerProvider(context, client, cluster, token) - - manager := clustermanager.NewClusterManagerFromCluster(cluster, provider, nc, eventService) - - return provider, manager -}