From de0573784ed17dee5933bf0587714e19eec525f5 Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Fri, 24 Jan 2020 16:01:14 -0800 Subject: [PATCH] ok it builds again --- .../kubeconfig/testdata/kubeconfig/config1 | 6 +++--- pkg/minikube/registry/drvs/docker/docker.go | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/pkg/minikube/kubeconfig/testdata/kubeconfig/config1 b/pkg/minikube/kubeconfig/testdata/kubeconfig/config1 index 8c497d4ccb..7e39058ec1 100644 --- a/pkg/minikube/kubeconfig/testdata/kubeconfig/config1 +++ b/pkg/minikube/kubeconfig/testdata/kubeconfig/config1 @@ -1,7 +1,7 @@ apiVersion: v1 -clusters: [] -contexts: [] +clusters: null +contexts: null current-context: minikube kind: Config preferences: {} -users: [] +users: null diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 3085c8eda9..e9cb5309c7 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -42,15 +42,13 @@ func init() { } func configure(mc config.MachineConfig) interface{} { - cp, _ := config.PrimaryControlPlane(mc) return kic.NewDriver(kic.Config{ - MachineName: mc.Name, - StorePath: localpath.MiniPath(), - ImageDigest: kic.BaseImage, - CPU: mc.CPUs, - Memory: mc.Memory, - HostBindPort: cp.Port, - OCIBinary: oci.Docker, + MachineName: mc.Name, + StorePath: localpath.MiniPath(), + ImageDigest: kic.BaseImage, + CPU: mc.CPUs, + Memory: mc.Memory, + OCIBinary: oci.Docker, }) }