Rename the error as 'ErrContainerRuntimeNotRunning', and move it to p…

…ackage cruntime.
kubernetes · Feb 8, 2021 · c19451e · c19451e
1 parent 18580c2
commit c19451e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/pkg/drivers/kic/oci/errors.go b/pkg/drivers/kic/oci/errors.go
@@ -33,9 +33,6 @@ func (f *FailFastError) Error() string {
 	return f.Err.Error()
 }
 
-// ErrDockerRuntimeNotRunning is thrown when docker runtime is not running
-var ErrDockerRuntimeNotRunning = &FailFastError{errors.New("docker runtime is not running")}
-
 // ErrWindowsContainers is thrown when docker been configured to run windows containers instead of Linux
 var ErrWindowsContainers = &FailFastError{errors.New("docker container type is windows")}
 

diff --git a/pkg/minikube/bootstrapper/bsutil/kubeadm.go b/pkg/minikube/bootstrapper/bsutil/kubeadm.go
@@ -25,7 +25,6 @@ import (
 	"github.com/blang/semver"
 	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
-	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/ktmpl"
 	"k8s.io/minikube/pkg/minikube/cni"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -65,7 +64,7 @@ func GenerateKubeadmYAML(cc config.ClusterConfig, n config.Node, r cruntime.Mana
 	cgroupDriver, err := r.CGroupDriver()
 	if err != nil {
 		if !r.Active() {
-			return nil, oci.ErrDockerRuntimeNotRunning
+			return nil, cruntime.ErrContainerRuntimeNotRunning
 		}
 		return nil, errors.Wrap(err, "getting cgroup driver")
 	}

diff --git a/pkg/minikube/cruntime/cruntime.go b/pkg/minikube/cruntime/cruntime.go
@@ -22,7 +22,9 @@ import (
 	"os/exec"
 
 	"github.com/blang/semver"
+	"github.com/pkg/errors"
 	"k8s.io/klog/v2"
+	"k8s.io/minikube/pkg/drivers/kic/oci"
 	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -142,6 +144,9 @@ type ListOptions struct {
 	Namespaces []string
 }
 
+// ErrContainerRuntimeNotRunning is thrown when docker runtime is not running
+var ErrContainerRuntimeNotRunning = &oci.FailFastError{Err: errors.New("container runtime is not running")}
+
 // New returns an appropriately configured runtime
 func New(c Config) (Manager, error) {
 	sm := sysinit.New(c.Runner)

diff --git a/pkg/minikube/node/start.go b/pkg/minikube/node/start.go
@@ -297,8 +297,8 @@ func setupKubeAdm(mAPI libmachine.API, cfg config.ClusterConfig, n config.Node,
 	// update cluster and set up certs
 
 	if err := bs.UpdateCluster(cfg); err != nil {
-		if errors.Is(err, oci.ErrDockerRuntimeNotRunning) {
-			exit.Message(reason.EnvDockerUnavailable, "Docker runtime is not running.")
+		if errors.Is(err, cruntime.ErrContainerRuntimeNotRunning) {
+			exit.Message(reason.EnvDockerUnavailable, "Container runtime is not running.")
 		}
 		exit.Error(reason.KubernetesInstallFailed, "Failed to update cluster", err)
 	}