kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

point to host daemon more places

pull/6885/head
Medya Gh 2020-03-04 10:37:10 -08:00
parent 5c5bfa7ef5
commit 54df61d677
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/drivers/kic/kic.go
View File

@ -136,10 +136,10 @@ func (d *Driver) prepareSSH() error {
// DriverName returns the name of the driver // DriverName returns the name of the driver
func (d *Driver) DriverName() string { func (d *Driver) DriverName() string {
if d.NodeConfig.OCIBinary == "podman" { if d.NodeConfig.OCIBinary == oci.Podman {
return "podman" return oci.Podman
} }
return "docker" return oci.Docker
} }
// GetIP returns an IP or hostname that this host is available at // GetIP returns an IP or hostname that this host is available at
@ -227,6 +227,9 @@ func (d *Driver) GetState() (state.State, error) {
// Kill stops a host forcefully, including any containers that we are managing. // Kill stops a host forcefully, including any containers that we are managing.
func (d *Driver) Kill() error { func (d *Driver) Kill() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
}
cmd := exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName) cmd := exec.Command(d.NodeConfig.OCIBinary, "kill", d.MachineName)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return errors.Wrapf(err, "killing kic node %s", d.MachineName) return errors.Wrapf(err, "killing kic node %s", d.MachineName)
@ -236,6 +239,10 @@ func (d *Driver) Kill() error {
// Remove will delete the Kic Node Container // Remove will delete the Kic Node Container
func (d *Driver) Remove() error { func (d *Driver) Remove() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
}
if _, err := oci.ContainerID(d.OCIBinary, d.MachineName); err != nil { if _, err := oci.ContainerID(d.OCIBinary, d.MachineName); err != nil {
log.Warnf("could not find the container %s to remove it.", d.MachineName) log.Warnf("could not find the container %s to remove it.", d.MachineName)
} }
@ -253,13 +260,14 @@ func (d *Driver) Remove() error {
// Restart a host // Restart a host
func (d *Driver) Restart() error { func (d *Driver) Restart() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
}
s, err := d.GetState() s, err := d.GetState()
if err != nil { if err != nil {
return errors.Wrap(err, "get kic state") return errors.Wrap(err, "get kic state")
} }
switch s { switch s {
case state.Paused:
return d.Unpause()
case state.Stopped: case state.Stopped:
return d.Start() return d.Start()
case state.Running, state.Error: case state.Running, state.Error:
@ -275,18 +283,12 @@ func (d *Driver) Restart() error {
return fmt.Errorf("restarted not implemented for kic state %s yet", s) return fmt.Errorf("restarted not implemented for kic state %s yet", s)
} }
// Unpause a kic container
func (d *Driver) Unpause() error {
cmd := exec.Command(d.NodeConfig.OCIBinary, "unpause", d.MachineName)
if err := cmd.Run(); err != nil {
return errors.Wrapf(err, "unpausing %s", d.MachineName)
}
return nil
}
// Start a _stopped_ kic container // Start a _stopped_ kic container
// not meant to be used for Create(). // not meant to be used for Create().
func (d *Driver) Start() error { func (d *Driver) Start() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
}
s, err := d.GetState() s, err := d.GetState()
if err != nil { if err != nil {
return errors.Wrap(err, "get kic state") return errors.Wrap(err, "get kic state")
@ -304,6 +306,9 @@ func (d *Driver) Start() error {
// Stop a host gracefully, including any containers that we are managing. // Stop a host gracefully, including any containers that we are managing.
func (d *Driver) Stop() error { func (d *Driver) Stop() error {
if err := oci.PointToHostDockerDaemon(); err != nil {
return state.Error, errors.Wrap(err, "point host docker daemon")
}
cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName) cmd := exec.Command(d.NodeConfig.OCIBinary, "stop", d.MachineName)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return errors.Wrapf(err, "stopping %s", d.MachineName) return errors.Wrapf(err, "stopping %s", d.MachineName)

2
pkg/minikube/driver/driver.go
View File

@ -85,7 +85,7 @@ func Supported(name string) bool {
return false return false
} }
// IsKIC checks if the driver is a kubernetes in continer // IsKIC checks if the driver is a kubernetes in container
func IsKIC(name string) bool { func IsKIC(name string) bool {
return name == Docker || name == Podman return name == Docker || name == Podman
} }