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

Merge pull request #1539 from aaron-prindle/driver-folder 

moved none driver into subdirectory
pull/1549/head
Aaron Prindle 2017-06-01 11:38:25 -07:00 committed by GitHub
parent ccb0fb3bd2 5a59bb596f
commit 3e581c7fe7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/minikube/cluster/cluster_linux.go
View File

@ -24,7 +24,7 @@ import (
"github.com/docker/machine/libmachine/drivers" "github.com/docker/machine/libmachine/drivers"
cfg "k8s.io/minikube/pkg/minikube/config" cfg "k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants" "k8s.io/minikube/pkg/minikube/constants"
pkgDrivers "k8s.io/minikube/pkg/minikube/machine/drivers" "k8s.io/minikube/pkg/minikube/machine/drivers/none"
) )
type kvmDriver struct { type kvmDriver struct {
@ -69,8 +69,8 @@ func detectVBoxManageCmd() string {
return cmd return cmd
} }
func createNoneHost(config MachineConfig) *pkgDrivers.Driver { func createNoneHost(config MachineConfig) *none.Driver {
return &pkgDrivers.Driver{ return &none.Driver{
BaseDriver: &drivers.BaseDriver{ BaseDriver: &drivers.BaseDriver{
MachineName: cfg.GetMachineName(), MachineName: cfg.GetMachineName(),
StorePath: constants.GetMinipath(), StorePath: constants.GetMinipath(),

6
pkg/minikube/machine/client_linux.go
View File

@ -24,7 +24,7 @@ import (
"github.com/docker/machine/libmachine/drivers/plugin" "github.com/docker/machine/libmachine/drivers/plugin"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/pkg/errors" "github.com/pkg/errors"
pkgDrivers "k8s.io/minikube/pkg/minikube/machine/drivers" "k8s.io/minikube/pkg/minikube/machine/drivers/none"
) )
var driverMap = map[string]driverGetter{ var driverMap = map[string]driverGetter{
@ -42,7 +42,7 @@ https://github.com/kubernetes/minikube/blob/master/DRIVERS.md#kvm-driver
func getNoneDriver(rawDriver []byte) (drivers.Driver, error) { func getNoneDriver(rawDriver []byte) (drivers.Driver, error) {
var driver drivers.Driver var driver drivers.Driver
driver = &pkgDrivers.Driver{} driver = &none.Driver{}
if err := json.Unmarshal(rawDriver, &driver); err != nil { if err := json.Unmarshal(rawDriver, &driver); err != nil {
return nil, errors.Wrap(err, "Error unmarshalling none driver") return nil, errors.Wrap(err, "Error unmarshalling none driver")
} }
@ -55,7 +55,7 @@ func registerDriver(driverName string) {
case "virtualbox": case "virtualbox":
plugin.RegisterDriver(virtualbox.NewDriver("", "")) plugin.RegisterDriver(virtualbox.NewDriver("", ""))
case "none": case "none":
plugin.RegisterDriver(pkgDrivers.NewDriver("", "")) plugin.RegisterDriver(none.NewDriver("", ""))
default: default:
glog.Exitf("Unsupported driver: %s\n", driverName) glog.Exitf("Unsupported driver: %s\n", driverName)
} }

2
pkg/minikube/machine/drivers/none-driver.go → pkg/minikube/machine/drivers/none/none.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package drivers package none
import ( import (
"errors" "errors"