Switch to github.com/crc-org/machine

machine was moved there as we want to stop using the code-ready namespace. The go.mod replacement for github.com/crc-org/machine is needed until Need this until crc-org/machine#67 is merged.
crc-org · Oct 31, 2022 · 6bf134e · 6bf134e
1 parent e0a53ce
commit 6bf134e
Show file tree

Hide file tree

Showing 28 changed files with 43 additions and 43 deletions.
diff --git a/go.mod b/go.mod
@@ -11,11 +11,11 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
 	github.com/cavaliergopher/grab/v3 v3.0.1
 	github.com/cheggaaa/pb/v3 v3.0.8
-	github.com/code-ready/machine v0.0.0-20220927132822-3408fdecc41c
 	github.com/containers/gvisor-tap-vsock v0.4.1-0.20220908123107-8d91f6d62de2
 	github.com/containers/image/v5 v5.15.0
 	github.com/coreos/go-systemd/v22 v22.3.2
 	github.com/crc-org/admin-helper v0.0.12-0.20221012143549-fd5acd1c478e
+	github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b
 	github.com/crc-org/vfkit v0.0.2-0.20221012144032-2e4961165b68
 	github.com/cucumber/godog v0.12.5
 	github.com/cucumber/messages-go/v10 v10.0.3

diff --git a/go.sum b/go.sum
@@ -241,8 +241,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
 github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
 github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/code-ready/machine v0.0.0-20220927132822-3408fdecc41c h1:cVthP8D5RUFAegEqrVWXiHUwRR+0dqN0mdOGYU6RJwU=
-github.com/code-ready/machine v0.0.0-20220927132822-3408fdecc41c/go.mod h1:zeUHkDy+CASmOmTcbvv9m5SlkXmhp0MAtcs6f7EMp68=
 github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
 github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
@@ -367,6 +365,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/crc-org/admin-helper v0.0.12-0.20221012143549-fd5acd1c478e h1:T6m4n9ZQzeGHq3/PaaoMBE5aefogjZT2Y9FOarbujoE=
 github.com/crc-org/admin-helper v0.0.12-0.20221012143549-fd5acd1c478e/go.mod h1:CerKYGP0C/zPeDd6T/k8H7TmyKKBWhfhAzAupcSKPMU=
+github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b h1:VPbW5D21B1WToPvEA/EGwhi4e3lXevmRff9M1lUTc5g=
+github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b/go.mod h1:9bEsvgLE3LIPfvGATt9Mo73gG1CKKS6A/++VqOONKqc=
 github.com/crc-org/vfkit v0.0.2-0.20221012144032-2e4961165b68 h1:BD25mjxOu/hnh2ajkMnyAJbAqvcFTS+YyEaqlwU2o/U=
 github.com/crc-org/vfkit v0.0.2-0.20221012144032-2e4961165b68/go.mod h1:9Q+9eVp1Ygxi6Fss8Id6erZ1TKUpHEo2f7b2i7EOuG8=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=

diff --git a/pkg/crc/machine/config/driver.go b/pkg/crc/machine/config/driver.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func ConvertGiBToBytes(gib int) uint64 {

diff --git a/pkg/crc/machine/driver.go b/pkg/crc/machine/driver.go
@@ -3,7 +3,7 @@ package machine
 import (
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/crc/pkg/libmachine/host"
-	libmachine "github.com/code-ready/machine/libmachine/drivers"
+	libmachine "github.com/crc-org/machine/libmachine/drivers"
 )
 
 type valueSetter func(driver *libmachine.VMDriver) bool

diff --git a/pkg/crc/machine/driver_darwin.go b/pkg/crc/machine/driver_darwin.go
@@ -11,7 +11,7 @@ import (
 	machineVf "github.com/code-ready/crc/pkg/drivers/vfkit"
 	"github.com/code-ready/crc/pkg/libmachine"
 	"github.com/code-ready/crc/pkg/libmachine/host"
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {

diff --git a/pkg/crc/machine/driver_linux.go b/pkg/crc/machine/driver_linux.go
@@ -9,8 +9,8 @@ import (
 	"github.com/code-ready/crc/pkg/crc/machine/libvirt"
 	"github.com/code-ready/crc/pkg/libmachine"
 	"github.com/code-ready/crc/pkg/libmachine/host"
-	machineLibvirt "github.com/code-ready/machine/drivers/libvirt"
-	"github.com/code-ready/machine/libmachine/drivers"
+	machineLibvirt "github.com/crc-org/machine/drivers/libvirt"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {

diff --git a/pkg/crc/machine/generate_bundle.go b/pkg/crc/machine/generate_bundle.go
@@ -12,7 +12,7 @@ import (
 	"github.com/code-ready/crc/pkg/crc/machine/bundle"
 	"github.com/code-ready/crc/pkg/crc/oc"
 	crcssh "github.com/code-ready/crc/pkg/crc/ssh"
-	"github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/state"
 	"github.com/pkg/errors"
 )
 

diff --git a/pkg/crc/machine/hyperv/driver_windows.go b/pkg/crc/machine/hyperv/driver_windows.go
@@ -9,7 +9,7 @@ import (
 	"github.com/code-ready/crc/pkg/crc/network"
 	"github.com/code-ready/crc/pkg/drivers/hyperv"
 	winnet "github.com/code-ready/crc/pkg/os/windows/network"
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func CreateHost(machineConfig config.MachineConfig) *hyperv.Driver {

diff --git a/pkg/crc/machine/libvirt/driver_linux.go b/pkg/crc/machine/libvirt/driver_linux.go
@@ -6,8 +6,8 @@ import (
 	"github.com/code-ready/crc/pkg/crc/constants"
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/crc/pkg/crc/network"
-	"github.com/code-ready/machine/drivers/libvirt"
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/drivers/libvirt"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func CreateHost(machineConfig config.MachineConfig) *libvirt.Driver {

diff --git a/pkg/crc/machine/machine.go b/pkg/crc/machine/machine.go
@@ -10,7 +10,7 @@ import (
 	"github.com/code-ready/crc/pkg/crc/machine/types"
 	"github.com/code-ready/crc/pkg/crc/network"
 	"github.com/code-ready/crc/pkg/libmachine"
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func getClusterConfig(bundleInfo *bundle.CrcBundleInfo) (*types.ClusterConfig, error) {

diff --git a/pkg/crc/machine/start.go b/pkg/crc/machine/start.go
@@ -32,8 +32,8 @@ import (
 	"github.com/code-ready/crc/pkg/crc/telemetry"
 	crctls "github.com/code-ready/crc/pkg/crc/tls"
 	"github.com/code-ready/crc/pkg/libmachine/host"
-	"github.com/code-ready/machine/libmachine/drivers"
-	libmachinestate "github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/drivers"
+	libmachinestate "github.com/crc-org/machine/libmachine/state"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"golang.org/x/crypto/ssh"

diff --git a/pkg/crc/machine/state/state.go b/pkg/crc/machine/state/state.go
@@ -1,6 +1,6 @@
 package state
 
-import libmachinestate "github.com/code-ready/machine/libmachine/state"
+import libmachinestate "github.com/crc-org/machine/libmachine/state"
 
 // State represents the state of crc (both VM and components)
 type State string

diff --git a/pkg/crc/machine/vfkit/driver_darwin.go b/pkg/crc/machine/vfkit/driver_darwin.go
@@ -8,7 +8,7 @@ import (
 	"github.com/code-ready/crc/pkg/crc/machine/config"
 	"github.com/code-ready/crc/pkg/crc/network"
 	"github.com/code-ready/crc/pkg/drivers/vfkit"
-	"github.com/code-ready/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func CreateHost(machineConfig config.MachineConfig) *vfkit.Driver {

diff --git a/pkg/drivers/hyperv/hyperv_windows.go b/pkg/drivers/hyperv/hyperv_windows.go
@@ -10,8 +10,8 @@ import (
 	log "github.com/code-ready/crc/pkg/crc/logging"
 	crcos "github.com/code-ready/crc/pkg/os"
 	"github.com/code-ready/crc/pkg/os/windows/powershell"
-	"github.com/code-ready/machine/libmachine/drivers"
-	"github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/state"
 )
 
 type Driver struct {

diff --git a/pkg/drivers/none/driver.go b/pkg/drivers/none/driver.go
@@ -3,8 +3,8 @@ package none
 import (
 	"fmt"
 
-	"github.com/code-ready/machine/libmachine/drivers"
-	"github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/state"
 )
 
 const driverName = "none"

diff --git a/pkg/drivers/vfkit/driver_darwin.go b/pkg/drivers/vfkit/driver_darwin.go
@@ -28,8 +28,8 @@ import (
 	"time"
 
 	crcos "github.com/code-ready/crc/pkg/os"
-	"github.com/code-ready/machine/libmachine/drivers"
-	"github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/state"
 	"github.com/crc-org/vfkit/pkg/client"
 	"github.com/pkg/errors"
 	"github.com/shirou/gopsutil/v3/process"

diff --git a/pkg/libmachine/host/host.go b/pkg/libmachine/host/host.go
@@ -10,8 +10,8 @@ import (
 
 	crcerrors "github.com/code-ready/crc/pkg/crc/errors"
 	log "github.com/code-ready/crc/pkg/crc/logging"
-	"github.com/code-ready/machine/libmachine/drivers"
-	"github.com/code-ready/machine/libmachine/state"
+	"github.com/crc-org/machine/libmachine/drivers"
+	"github.com/crc-org/machine/libmachine/state"
 )
 
 // ConfigVersion dictates which version of the config.json format is

diff --git a/pkg/libmachine/libmachine.go b/pkg/libmachine/libmachine.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/code-ready/crc/pkg/libmachine/host"
 	"github.com/code-ready/crc/pkg/libmachine/persist"
-	rpcdriver "github.com/code-ready/machine/libmachine/drivers/rpc"
+	rpcdriver "github.com/crc-org/machine/libmachine/drivers/rpc"
 )
 
 type API interface {

diff --git a/vendor/github.com/code-ready/machine/LICENSE → vendor/github.com/crc-org/machine/LICENSE b/vendor/github.com/code-ready/machine/LICENSE → vendor/github.com/crc-org/machine/LICENSE
diff --git a/...y/machine/drivers/libvirt/driver_linux.go → ...g/machine/drivers/libvirt/driver_linux.go b/...y/machine/drivers/libvirt/driver_linux.go → ...g/machine/drivers/libvirt/driver_linux.go
diff --git a/...-ready/machine/libmachine/drivers/base.go → ...rc-org/machine/libmachine/drivers/base.go b/...-ready/machine/libmachine/drivers/base.go → ...rc-org/machine/libmachine/drivers/base.go
diff --git a/...ady/machine/libmachine/drivers/drivers.go → ...org/machine/libmachine/drivers/drivers.go b/...ady/machine/libmachine/drivers/drivers.go → ...org/machine/libmachine/drivers/drivers.go
diff --git a/...hine/drivers/plugin/localbinary/plugin.go → ...hine/drivers/plugin/localbinary/plugin.go b/...hine/drivers/plugin/localbinary/plugin.go → ...hine/drivers/plugin/localbinary/plugin.go
diff --git a/...e/libmachine/drivers/rpc/client_driver.go → ...e/libmachine/drivers/rpc/client_driver.go b/...e/libmachine/drivers/rpc/client_driver.go → ...e/libmachine/drivers/rpc/client_driver.go
diff --git a/...e/libmachine/drivers/rpc/server_driver.go → ...e/libmachine/drivers/rpc/server_driver.go b/...e/libmachine/drivers/rpc/server_driver.go → ...e/libmachine/drivers/rpc/server_driver.go
diff --git a/...e-ready/machine/libmachine/state/state.go → ...crc-org/machine/libmachine/state/state.go b/...e-ready/machine/libmachine/state/state.go → ...crc-org/machine/libmachine/state/state.go
diff --git a/...ady/machine/libmachine/version/version.go → ...org/machine/libmachine/version/version.go b/...ady/machine/libmachine/version/version.go → ...org/machine/libmachine/version/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -77,14 +77,6 @@ github.com/cespare/xxhash/v2
 ## explicit; go 1.12
 github.com/cheggaaa/pb/v3
 github.com/cheggaaa/pb/v3/termutil
-# github.com/code-ready/machine v0.0.0-20220927132822-3408fdecc41c
-## explicit; go 1.17
-github.com/code-ready/machine/drivers/libvirt
-github.com/code-ready/machine/libmachine/drivers
-github.com/code-ready/machine/libmachine/drivers/plugin/localbinary
-github.com/code-ready/machine/libmachine/drivers/rpc
-github.com/code-ready/machine/libmachine/state
-github.com/code-ready/machine/libmachine/version
 # github.com/containers/gvisor-tap-vsock v0.4.1-0.20220908123107-8d91f6d62de2
 ## explicit; go 1.16
 github.com/containers/gvisor-tap-vsock/pkg/client
@@ -172,6 +164,14 @@ github.com/coreos/go-systemd/v22/daemon
 github.com/crc-org/admin-helper/pkg/client
 github.com/crc-org/admin-helper/pkg/hosts
 github.com/crc-org/admin-helper/pkg/types
+# github.com/crc-org/machine v0.0.0-20221028075518-f9b43442196b
+## explicit; go 1.17
+github.com/crc-org/machine/drivers/libvirt
+github.com/crc-org/machine/libmachine/drivers
+github.com/crc-org/machine/libmachine/drivers/plugin/localbinary
+github.com/crc-org/machine/libmachine/drivers/rpc
+github.com/crc-org/machine/libmachine/state
+github.com/crc-org/machine/libmachine/version
 # github.com/crc-org/vfkit v0.0.2-0.20221012144032-2e4961165b68
 ## explicit; go 1.17
 github.com/crc-org/vfkit/pkg/client