Remove "hostKind" argument from GetDockerInfo

Signed-off-by: Kimmo Lehto <[email protected]>
Mirantis · Feb 8, 2024 · b6321f7 · b6321f7
1 parent 4e840ee
commit b6321f7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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)
 	}