From beec3b1ce133cc4de8c32d488a7e853d90b4bfae Mon Sep 17 00:00:00 2001
From: Medya Gh <medya@google.com>
Date: Mon, 23 Mar 2020 13:34:36 -0700
Subject: [PATCH] stop kubelet on docker stop

---
 pkg/drivers/common.go    | 32 ++++++++++++++++++++++++++++++++
 pkg/drivers/kic/kic.go   |  6 ++++++
 pkg/drivers/none/none.go | 37 ++++---------------------------------
 3 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/pkg/drivers/common.go b/pkg/drivers/common.go
index 2fde2efde8..20d3f537a9 100644
--- a/pkg/drivers/common.go
+++ b/pkg/drivers/common.go
@@ -17,11 +17,15 @@ limitations under the License.
 package drivers
 
 import (
+	"fmt"
 	"io"
 	"io/ioutil"
 	"os"
+	"os/exec"
 	"path/filepath"
+	"strings"
 	"syscall"
+	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -29,6 +33,8 @@ import (
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/golang/glog"
 	"github.com/pkg/errors"
+	"k8s.io/minikube/pkg/minikube/command"
+	"k8s.io/minikube/pkg/util/retry"
 )
 
 // This file is for common code shared among internal machine drivers
@@ -139,3 +145,29 @@ func fixMachinePermissions(path string) error {
 	}
 	return nil
 }
+
+// StopKubelet idempotently stops the kubelet
+func StopKubelet(cr command.Runner) error {
+	glog.Infof("stopping kubelet.service ...")
+	stop := func() error {
+		cmd := exec.Command("sudo", "systemctl", "stop", "-f", "kubelet.service")
+		if rr, err := cr.RunCmd(cmd); err != nil {
+			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
+		}
+		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
+		rr, err := cr.RunCmd(cmd)
+		if err != nil {
+			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
+		}
+		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
+			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
+		}
+		return nil
+	}
+
+	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
+		return errors.Wrapf(err, "error stopping kubelet")
+	}
+
+	return nil
+}
diff --git a/pkg/drivers/kic/kic.go b/pkg/drivers/kic/kic.go
index 2488ca8e86..ea50fe3ad2 100644
--- a/pkg/drivers/kic/kic.go
+++ b/pkg/drivers/kic/kic.go
@@ -312,6 +312,12 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
+	// docker does not send right SIG for systemd to know to stop the systemd.
+	// to avoid bind adress be taken on an upgrade. more info https://github.com/kubernetes/minikube/issues/7171
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v", err)
+	}
+
 	cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
 	if err := cmd.Run(); err != nil {
 		return errors.Wrapf(err, "stopping %s", d.MachineName)
diff --git a/pkg/drivers/none/none.go b/pkg/drivers/none/none.go
index 2fd3565741..f05f907138 100644
--- a/pkg/drivers/none/none.go
+++ b/pkg/drivers/none/none.go
@@ -20,8 +20,6 @@ import (
 	"fmt"
 	"net"
 	"os/exec"
-	"strings"
-	"time"
 
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/state"
@@ -35,7 +33,6 @@ import (
 	"k8s.io/minikube/pkg/minikube/cruntime"
 	"k8s.io/minikube/pkg/minikube/kubeconfig"
 	"k8s.io/minikube/pkg/minikube/vmpath"
-	"k8s.io/minikube/pkg/util/retry"
 )
 
 // cleanupPaths are paths to be removed by cleanup, and are used by both kubeadm and minikube.
@@ -156,8 +153,8 @@ func (d *Driver) GetState() (state.State, error) {
 
 // Kill stops a host forcefully, including any containers that we are managing.
 func (d *Driver) Kill() error {
-	if err := stopKubelet(d.exec); err != nil {
-		return errors.Wrap(err, "kubelet")
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v. will continue with kill anyways.", err)
 	}
 
 	// First try to gracefully stop containers
@@ -220,8 +217,8 @@ func (d *Driver) Start() error {
 
 // Stop a host gracefully, including any containers that we are managing.
 func (d *Driver) Stop() error {
-	if err := stopKubelet(d.exec); err != nil {
-		return errors.Wrap(err, "stop kubelet")
+	if err := pkgdrivers.StopKubelet(d.exec); err != nil {
+		glog.Warning("couldn't stop kubelet %v. will continue with stop anyways.", err)
 	}
 	containers, err := d.runtime.ListContainers(cruntime.ListOptions{})
 	if err != nil {
@@ -241,32 +238,6 @@ func (d *Driver) RunSSHCommandFromDriver() error {
 	return fmt.Errorf("driver does not support ssh commands")
 }
 
-// stopKubelet idempotently stops the kubelet
-func stopKubelet(cr command.Runner) error {
-	glog.Infof("stopping kubelet.service ...")
-	stop := func() error {
-		cmd := exec.Command("sudo", "systemctl", "stop", "kubelet.service")
-		if rr, err := cr.RunCmd(cmd); err != nil {
-			glog.Errorf("temporary error for %q : %v", rr.Command(), err)
-		}
-		cmd = exec.Command("sudo", "systemctl", "show", "-p", "SubState", "kubelet")
-		rr, err := cr.RunCmd(cmd)
-		if err != nil {
-			glog.Errorf("temporary error: for %q : %v", rr.Command(), err)
-		}
-		if !strings.Contains(rr.Stdout.String(), "dead") && !strings.Contains(rr.Stdout.String(), "failed") {
-			return fmt.Errorf("unexpected kubelet state: %q", rr.Stdout.String())
-		}
-		return nil
-	}
-
-	if err := retry.Expo(stop, 2*time.Second, time.Minute*3, 5); err != nil {
-		return errors.Wrapf(err, "error stopping kubelet")
-	}
-
-	return nil
-}
-
 // restartKubelet restarts the kubelet
 func restartKubelet(cr command.Runner) error {
 	glog.Infof("restarting kubelet.service ...")