diff --git a/pkg/configurer/common.go b/pkg/configurer/common.go index 1bae4187..09a344b4 100644 --- a/pkg/configurer/common.go +++ b/pkg/configurer/common.go @@ -13,7 +13,7 @@ import ( type DockerConfigurer struct{} // GetDockerInfo gets docker info from the host. -func (c DockerConfigurer) GetDockerInfo(h os.Host, hostKind string) (common.DockerInfo, error) { +func (c DockerConfigurer) GetDockerInfo(h os.Host) (common.DockerInfo, error) { command := "docker info --format \"{{json . }}\"" log.Debugf("%s attempting to gather info with `%s`", h, command) info, err := h.ExecOutput(command) diff --git a/pkg/configurer/enterpriselinux/el.go b/pkg/configurer/enterpriselinux/el.go index 30fd6792..60c9b8dd 100644 --- a/pkg/configurer/enterpriselinux/el.go +++ b/pkg/configurer/enterpriselinux/el.go @@ -26,7 +26,7 @@ func (c Configurer) InstallMKEBasePackages(h os.Host) error { // UninstallMCR uninstalls docker-ee engine. func (c Configurer) UninstallMCR(h os.Host, _ string, engineConfig common.MCRConfig) error { - info, getDockerError := c.GetDockerInfo(h, c.Kind()) + info, getDockerError := c.GetDockerInfo(h) if engineConfig.Prune { defer c.CleanupLingeringMCR(h, info) } diff --git a/pkg/configurer/sles/sles.go b/pkg/configurer/sles/sles.go index b1fa2e8e..fd5ed99a 100644 --- a/pkg/configurer/sles/sles.go +++ b/pkg/configurer/sles/sles.go @@ -29,7 +29,7 @@ func (c Configurer) InstallMKEBasePackages(h os.Host) error { // UninstallMCR uninstalls docker-ee engine. func (c Configurer) UninstallMCR(h os.Host, _ string, engineConfig common.MCRConfig) error { - info, getDockerError := c.GetDockerInfo(h, c.Kind()) + info, getDockerError := c.GetDockerInfo(h) if engineConfig.Prune { defer c.CleanupLingeringMCR(h, info) } diff --git a/pkg/configurer/ubuntu/ubuntu.go b/pkg/configurer/ubuntu/ubuntu.go index 675e932b..684fcc2a 100644 --- a/pkg/configurer/ubuntu/ubuntu.go +++ b/pkg/configurer/ubuntu/ubuntu.go @@ -26,7 +26,7 @@ func (c Configurer) InstallMKEBasePackages(h os.Host) error { // UninstallMCR uninstalls docker-ee engine. func (c Configurer) UninstallMCR(h os.Host, _ string, engineConfig common.MCRConfig) error { - info, getDockerError := c.GetDockerInfo(h, c.Kind()) + info, getDockerError := c.GetDockerInfo(h) if engineConfig.Prune { defer c.CleanupLingeringMCR(h, info) } diff --git a/pkg/configurer/windows.go b/pkg/configurer/windows.go index b4a07276..6f191b2b 100644 --- a/pkg/configurer/windows.go +++ b/pkg/configurer/windows.go @@ -78,7 +78,7 @@ func (c WindowsConfigurer) InstallMCR(h os.Host, scriptPath string, engineConfig // This relies on using the http://get.mirantis.com/install.ps1 script with the '-Uninstall' option, and some cleanup as per // https://docs.microsoft.com/en-us/virtualization/windowscontainers/manage-docker/configure-docker-daemon#how-to-uninstall-docker func (c WindowsConfigurer) UninstallMCR(h os.Host, scriptPath string, engineConfig common.MCRConfig) error { - info, getDockerError := c.GetDockerInfo(h, c.Kind()) + info, getDockerError := c.GetDockerInfo(h) if engineConfig.Prune { defer c.CleanupLingeringMCR(h, info) }