Skip to content

Commit 6ae4e88

Browse files
committed
Internalize vendor/github.com/docker/machine
Skip the host version v0-v2 migration code and os provisioners. Also skip all the version handling, for downloading boot2docker. Only copy the hyperv and virtualbox drivers actually being used. There is an "errdriver" that is only used for internal testing. Import github.com/Parallels/docker-machine-parallels/v2 Import github.com/machine-drivers/docker-machine-driver-vmware
1 parent 4f29ed6 commit 6ae4e88

File tree

171 files changed

+10913
-256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+10913
-256
lines changed

cmd/drivers/hyperkit/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"os"
2424

25-
"github.com/docker/machine/libmachine/drivers/plugin"
25+
"k8s.io/minikube/pkg/libmachine/drivers/plugin"
2626
"k8s.io/minikube/pkg/drivers/hyperkit"
2727
)
2828

cmd/drivers/kvm/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"os"
2424

25-
"github.com/docker/machine/libmachine/drivers/plugin"
25+
"k8s.io/minikube/pkg/libmachine/drivers/plugin"
2626
"k8s.io/minikube/pkg/drivers/kvm"
2727
)
2828

cmd/minikube/cmd/config/profile_list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/minikube/pkg/minikube/reason"
3434
"k8s.io/minikube/pkg/minikube/style"
3535

36-
"github.com/docker/machine/libmachine"
36+
"k8s.io/minikube/pkg/libmachine"
3737
"github.com/olekukonko/tablewriter"
3838
"github.com/olekukonko/tablewriter/tw"
3939
"github.com/spf13/cobra"

cmd/minikube/cmd/delete.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"strings"
2727
"time"
2828

29-
"github.com/docker/machine/libmachine/mcnerror"
29+
"k8s.io/minikube/pkg/libmachine/mcnerror"
3030
"github.com/mitchellh/go-ps"
3131
"github.com/pkg/errors"
3232

33-
"github.com/docker/machine/libmachine"
33+
"k8s.io/minikube/pkg/libmachine"
3434
"github.com/spf13/cobra"
3535
"github.com/spf13/viper"
3636
"k8s.io/klog/v2"

cmd/minikube/cmd/delete_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/docker/machine/libmachine"
28+
"k8s.io/minikube/pkg/libmachine"
2929
"github.com/google/go-cmp/cmp"
3030
"github.com/otiai10/copy"
3131
"github.com/spf13/viper"

cmd/minikube/cmd/logs.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package cmd
1919
import (
2020
"os"
2121

22-
"github.com/docker/machine/libmachine/state"
22+
"k8s.io/minikube/pkg/libmachine/state"
2323
"github.com/spf13/cobra"
2424
"github.com/spf13/viper"
2525
"k8s.io/klog/v2"

cmd/minikube/cmd/podman-env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323
"os/exec"
2424
"strings"
2525

26-
"github.com/docker/machine/libmachine/drivers"
27-
"github.com/docker/machine/libmachine/ssh"
26+
"k8s.io/minikube/pkg/libmachine/drivers"
27+
"k8s.io/minikube/pkg/libmachine/ssh"
2828
"github.com/spf13/cobra"
2929
"k8s.io/minikube/pkg/drivers/kic/oci"
3030
"k8s.io/minikube/pkg/minikube/command"

cmd/minikube/cmd/podman-env_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"bytes"
2121
"testing"
2222

23-
"github.com/docker/machine/libmachine/ssh"
23+
"k8s.io/minikube/pkg/libmachine/ssh"
2424
"github.com/google/go-cmp/cmp"
2525
)
2626

cmd/minikube/cmd/start.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/Delta456/box-cli-maker/v2"
3737
"github.com/blang/semver/v4"
3838
"github.com/docker/go-connections/nat"
39-
"github.com/docker/machine/libmachine/ssh"
39+
"k8s.io/minikube/pkg/libmachine/ssh"
4040
"github.com/google/go-containerregistry/pkg/authn"
4141
"github.com/google/go-containerregistry/pkg/name"
4242
"github.com/google/go-containerregistry/pkg/v1/remote"

cmd/minikube/cmd/status.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"text/template"
2626
"time"
2727

28-
"github.com/docker/machine/libmachine"
29-
"github.com/docker/machine/libmachine/state"
28+
"k8s.io/minikube/pkg/libmachine"
29+
"k8s.io/minikube/pkg/libmachine/state"
3030
"github.com/pkg/errors"
3131
"github.com/spf13/cobra"
3232
"k8s.io/klog/v2"

0 commit comments

Comments
 (0)