From de409f9dd05bc75e81da07f8abb87fc9f2109f24 Mon Sep 17 00:00:00 2001 From: pixiake Date: Sun, 26 Apr 2020 10:36:30 +0800 Subject: [PATCH] add K2Cluster object --- pkg/cluster/container-engine/docker/docker.go | 23 ------------------- pkg/container-engine/docker/docker.go | 2 +- 2 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkg/cluster/container-engine/docker/docker.go diff --git a/pkg/cluster/container-engine/docker/docker.go b/pkg/cluster/container-engine/docker/docker.go deleted file mode 100644 index 09dd2bae..00000000 --- a/pkg/cluster/container-engine/docker/docker.go +++ /dev/null @@ -1,23 +0,0 @@ -package docker - -import ( - kubekeyapi "github.com/pixiake/kubekey/pkg/apis/kubekey/v1alpha1" - "github.com/pixiake/kubekey/pkg/util/manager" - "github.com/pixiake/kubekey/pkg/util/ssh" - "github.com/pkg/errors" -) - -func InstallerDocker(mgr *manager.Manager) error { - mgr.Logger.Infoln("Installing docker……") - - return mgr.RunTaskOnAllNodes(installDockerOnNode, true) -} - -func installDockerOnNode(mgr *manager.Manager, node *kubekeyapi.HostCfg, conn ssh.Connection) error { - cmd := "sudo sh -c \"[ -z $(which docker) ] && curl https://raw.githubusercontent.com/pixiake/kubeocean/master/scripts/docker-install.sh | sh ; systemctl enable docker\"" - _, err := mgr.Runner.RunCmd(cmd) - if err != nil { - return errors.Wrap(errors.WithStack(err), "failed to install docker") - } - return nil -} diff --git a/pkg/container-engine/docker/docker.go b/pkg/container-engine/docker/docker.go index da7d60e1..fa5ba953 100644 --- a/pkg/container-engine/docker/docker.go +++ b/pkg/container-engine/docker/docker.go @@ -60,7 +60,7 @@ func InstallerDocker(mgr *manager.Manager) error { } func installDockerOnNode(mgr *manager.Manager, node *kubekeyapi.HostCfg, conn ssh.Connection) error { - cmd := "sudo sh -c \"[ -z $(which docker) ] && curl https://raw.githubusercontent.com/pixiake/kubeocean/master/scripts/docker-install.sh | sh ; systemctl enable docker\"" + cmd := "sudo sh -c \"[ -z $(which docker) ] && curl https://raw.githubusercontent.com/pixiake/kubekey/master/scripts/docker-install.sh | sh ; systemctl enable docker\"" _, err := mgr.Runner.RunCmd(cmd) if err != nil { return errors.Wrap(errors.WithStack(err), "failed to install docker")