From d7b25ac6abf41a7fd804631e80e9afd7888d5221 Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Fri, 4 Dec 2020 13:45:57 +0100 Subject: [PATCH] v3 -> v4 --- Makefile | 4 ++-- README.md | 4 ++-- cmd/cluster/clusterCreate.go | 12 ++++++------ cmd/cluster/clusterDelete.go | 10 +++++----- cmd/cluster/clusterList.go | 8 ++++---- cmd/cluster/clusterStart.go | 10 +++++----- cmd/cluster/clusterStop.go | 8 ++++---- cmd/image/imageImport.go | 8 ++++---- cmd/kubeconfig/kubeconfigGet.go | 8 ++++---- cmd/kubeconfig/kubeconfigMerge.go | 10 +++++----- cmd/node/nodeCreate.go | 10 +++++----- cmd/node/nodeDelete.go | 8 ++++---- cmd/node/nodeList.go | 8 ++++---- cmd/node/nodeStart.go | 6 +++--- cmd/node/nodeStop.go | 6 +++--- cmd/root.go | 14 +++++++------- cmd/util/completion.go | 6 +++--- cmd/util/filter.go | 4 ++-- cmd/util/plugins.go | 2 +- cmd/util/ports.go | 2 +- cmd/util/volumes.go | 2 +- go.mod | 2 +- main.go | 2 +- pkg/cluster/cluster.go | 12 ++++++------ pkg/cluster/clusterName.go | 2 +- pkg/cluster/host.go | 6 +++--- pkg/cluster/kubeconfig.go | 4 ++-- pkg/cluster/loadbalancer.go | 4 ++-- pkg/cluster/node.go | 4 ++-- pkg/runtimes/containerd/kubeconfig.go | 2 +- pkg/runtimes/containerd/node.go | 2 +- pkg/runtimes/containerd/util.go | 2 +- pkg/runtimes/docker/container.go | 2 +- pkg/runtimes/docker/kubeconfig.go | 2 +- pkg/runtimes/docker/network.go | 2 +- pkg/runtimes/docker/node.go | 2 +- pkg/runtimes/docker/translate.go | 2 +- pkg/runtimes/docker/translate_test.go | 2 +- pkg/runtimes/docker/util.go | 2 +- pkg/runtimes/docker/volume.go | 2 +- pkg/runtimes/runtime.go | 6 +++--- pkg/tools/tools.go | 8 ++++---- 42 files changed, 111 insertions(+), 111 deletions(-) diff --git a/Makefile b/Makefile index 981055f8..00d3db01 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ PKG := $(shell go mod vendor) TAGS := TESTS := ./... TESTFLAGS := -LDFLAGS := -w -s -X github.com/rancher/k3d/v3/version.Version=${GIT_TAG} -X github.com/rancher/k3d/v3/version.K3sVersion=${K3S_TAG} +LDFLAGS := -w -s -X github.com/rancher/k3d/v4/version.Version=${GIT_TAG} -X github.com/rancher/k3d/v4/version.K3sVersion=${K3S_TAG} GCFLAGS := GOFLAGS := BINDIR := $(CURDIR)/bin @@ -66,7 +66,7 @@ BINARIES := k3d # Set version of the k3d helper images for build ifneq ($(K3D_HELPER_VERSION),) $(info [INFO] Helper Image version set to ${K3D_HELPER_VERSION}) -LDFLAGS += -X github.com/rancher/k3d/v3/version.HelperVersionOverride=${K3D_HELPER_VERSION} +LDFLAGS += -X github.com/rancher/k3d/v4/version.HelperVersionOverride=${K3D_HELPER_VERSION} endif # Rules for finding all go source files using 'DIRS' and 'REC_DIRS' diff --git a/README.md b/README.md index c416a0a5..2f68fc4e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![License](https://img.shields.io/github/license/rancher/k3d?style=flat-square)](./LICENSE.md) ![Downloads](https://img.shields.io/github/downloads/rancher/k3d/total.svg?style=flat-square) -[![Go Module](https://img.shields.io/badge/Go%20Module-github.com%2Francher%2Fk3d%2Fv3-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/rancher/k3d/v3) +[![Go Module](https://img.shields.io/badge/Go%20Module-github.com%2Francher%2Fk3d%2Fv3-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/rancher/k3d/v4) [![Go version](https://img.shields.io/github/go-mod/go-version/rancher/k3d?logo=go&logoColor=white&style=flat-square)](./go.mod) [![Go Report Card](https://goreportcard.com/badge/github.com/rancher/k3d?style=flat-square)](https://goreportcard.com/report/github.com/rancher/k3d) @@ -64,7 +64,7 @@ or... ## Build -1. Clone this repo, e.g. via `git clone git@github.com:rancher/k3d.git` or `go get github.com/rancher/k3d/v3@main` +1. Clone this repo, e.g. via `git clone git@github.com:rancher/k3d.git` or `go get github.com/rancher/k3d/v4@main` 2. Inside the repo run - 'make install-tools' to make sure required go packages are installed 3. Inside the repo run one of the following commands diff --git a/cmd/cluster/clusterCreate.go b/cmd/cluster/clusterCreate.go index 73b12f16..78cbf000 100644 --- a/cmd/cluster/clusterCreate.go +++ b/cmd/cluster/clusterCreate.go @@ -30,12 +30,12 @@ import ( "github.com/spf13/cobra" - cliutil "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - k3dCluster "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - "github.com/rancher/k3d/v3/version" + cliutil "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + k3dCluster "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v4/version" log "github.com/sirupsen/logrus" ) diff --git a/cmd/cluster/clusterDelete.go b/cmd/cluster/clusterDelete.go index 336743a4..8f710ba6 100644 --- a/cmd/cluster/clusterDelete.go +++ b/cmd/cluster/clusterDelete.go @@ -26,11 +26,11 @@ import ( "os" "path" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - k3dutil "github.com/rancher/k3d/v3/pkg/util" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + k3dutil "github.com/rancher/k3d/v4/pkg/util" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/cluster/clusterList.go b/cmd/cluster/clusterList.go index 413bae54..a9fb2944 100644 --- a/cmd/cluster/clusterList.go +++ b/cmd/cluster/clusterList.go @@ -28,10 +28,10 @@ import ( "os" "strings" - "github.com/rancher/k3d/v3/cmd/util" - k3cluster "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + k3cluster "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" "github.com/spf13/cobra" "gopkg.in/yaml.v2" diff --git a/cmd/cluster/clusterStart.go b/cmd/cluster/clusterStart.go index d98aacf8..c4144481 100644 --- a/cmd/cluster/clusterStart.go +++ b/cmd/cluster/clusterStart.go @@ -24,13 +24,13 @@ package cluster import ( "time" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v4/pkg/types" "github.com/spf13/cobra" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/cmd/cluster/clusterStop.go b/cmd/cluster/clusterStop.go index c0fd0b45..fc59c554 100644 --- a/cmd/cluster/clusterStop.go +++ b/cmd/cluster/clusterStop.go @@ -24,10 +24,10 @@ package cluster import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/cmd/image/imageImport.go b/cmd/image/imageImport.go index ef856517..d3b135b8 100644 --- a/cmd/image/imageImport.go +++ b/cmd/image/imageImport.go @@ -26,10 +26,10 @@ import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/runtimes" - "github.com/rancher/k3d/v3/pkg/tools" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v4/pkg/tools" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/cmd/kubeconfig/kubeconfigGet.go b/cmd/kubeconfig/kubeconfigGet.go index 72ce5f4d..55f31c52 100644 --- a/cmd/kubeconfig/kubeconfigGet.go +++ b/cmd/kubeconfig/kubeconfigGet.go @@ -25,10 +25,10 @@ import ( "fmt" "os" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" diff --git a/cmd/kubeconfig/kubeconfigMerge.go b/cmd/kubeconfig/kubeconfigMerge.go index 3d620153..c5d7e7ff 100644 --- a/cmd/kubeconfig/kubeconfigMerge.go +++ b/cmd/kubeconfig/kubeconfigMerge.go @@ -27,11 +27,11 @@ import ( "path" "strings" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - k3dutil "github.com/rancher/k3d/v3/pkg/util" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + k3dutil "github.com/rancher/k3d/v4/pkg/util" "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" diff --git a/cmd/node/nodeCreate.go b/cmd/node/nodeCreate.go index 26b648c0..66347080 100644 --- a/cmd/node/nodeCreate.go +++ b/cmd/node/nodeCreate.go @@ -27,11 +27,11 @@ import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v3/cmd/util" - k3dc "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - "github.com/rancher/k3d/v3/version" + "github.com/rancher/k3d/v4/cmd/util" + k3dc "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v4/version" log "github.com/sirupsen/logrus" ) diff --git a/cmd/node/nodeDelete.go b/cmd/node/nodeDelete.go index aa7adefe..33049f72 100644 --- a/cmd/node/nodeDelete.go +++ b/cmd/node/nodeDelete.go @@ -22,10 +22,10 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeList.go b/cmd/node/nodeList.go index 1d799fea..8d144108 100644 --- a/cmd/node/nodeList.go +++ b/cmd/node/nodeList.go @@ -28,10 +28,10 @@ import ( "strings" "github.com/liggitt/tabwriter" - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" diff --git a/cmd/node/nodeStart.go b/cmd/node/nodeStart.go index 91a6e666..e18fc7d9 100644 --- a/cmd/node/nodeStart.go +++ b/cmd/node/nodeStart.go @@ -22,9 +22,9 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" diff --git a/cmd/node/nodeStop.go b/cmd/node/nodeStop.go index 6b9a8a7a..117ba07f 100644 --- a/cmd/node/nodeStop.go +++ b/cmd/node/nodeStop.go @@ -22,11 +22,11 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/runtimes" + "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/runtimes" "github.com/spf13/cobra" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/cmd/root.go b/cmd/root.go index 3110f189..85efa800 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -31,13 +31,13 @@ import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v3/cmd/cluster" - "github.com/rancher/k3d/v3/cmd/image" - "github.com/rancher/k3d/v3/cmd/kubeconfig" - "github.com/rancher/k3d/v3/cmd/node" - cliutil "github.com/rancher/k3d/v3/cmd/util" - "github.com/rancher/k3d/v3/pkg/runtimes" - "github.com/rancher/k3d/v3/version" + "github.com/rancher/k3d/v4/cmd/cluster" + "github.com/rancher/k3d/v4/cmd/image" + "github.com/rancher/k3d/v4/cmd/kubeconfig" + "github.com/rancher/k3d/v4/cmd/node" + cliutil "github.com/rancher/k3d/v4/cmd/util" + "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v4/version" log "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/writer" ) diff --git a/cmd/util/completion.go b/cmd/util/completion.go index b772d42a..8ae10066 100644 --- a/cmd/util/completion.go +++ b/cmd/util/completion.go @@ -25,9 +25,9 @@ import ( "context" "strings" - k3dcluster "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3dcluster "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/util/filter.go b/cmd/util/filter.go index 203e3a2d..47e46bc3 100644 --- a/cmd/util/filter.go +++ b/cmd/util/filter.go @@ -28,9 +28,9 @@ import ( log "github.com/sirupsen/logrus" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v3/pkg/util" + "github.com/rancher/k3d/v4/pkg/util" "regexp" ) diff --git a/cmd/util/plugins.go b/cmd/util/plugins.go index ece487db..420ab375 100644 --- a/cmd/util/plugins.go +++ b/cmd/util/plugins.go @@ -28,7 +28,7 @@ import ( "os/exec" "strings" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" ) // HandlePlugin takes care of finding and executing a plugin based on the longest prefix diff --git a/cmd/util/ports.go b/cmd/util/ports.go index db87ea41..07a8c0ed 100644 --- a/cmd/util/ports.go +++ b/cmd/util/ports.go @@ -27,7 +27,7 @@ import ( "strconv" "strings" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/cmd/util/volumes.go b/cmd/util/volumes.go index 1cc1956e..9749081f 100644 --- a/cmd/util/volumes.go +++ b/cmd/util/volumes.go @@ -26,7 +26,7 @@ import ( "os" "strings" - "github.com/rancher/k3d/v3/pkg/runtimes" + "github.com/rancher/k3d/v4/pkg/runtimes" log "github.com/sirupsen/logrus" ) diff --git a/go.mod b/go.mod index 4b9918a6..18fb86c8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/k3d/v3 +module github.com/rancher/k3d/v4 go 1.14 diff --git a/main.go b/main.go index c4a3e25f..4d7efa0d 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ THE SOFTWARE. */ package main -import "github.com/rancher/k3d/v3/cmd" +import "github.com/rancher/k3d/v4/cmd" func main() { cmd.Execute() diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 48a4c027..1a5502d6 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -34,12 +34,12 @@ import ( gort "runtime" "github.com/imdario/mergo" - k3drt "github.com/rancher/k3d/v3/pkg/runtimes" - "github.com/rancher/k3d/v3/pkg/runtimes/docker" - "github.com/rancher/k3d/v3/pkg/types" - k3d "github.com/rancher/k3d/v3/pkg/types" - "github.com/rancher/k3d/v3/pkg/util" - "github.com/rancher/k3d/v3/version" + k3drt "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v4/pkg/runtimes/docker" + "github.com/rancher/k3d/v4/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v4/pkg/util" + "github.com/rancher/k3d/v4/version" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" ) diff --git a/pkg/cluster/clusterName.go b/pkg/cluster/clusterName.go index bbb26a76..7310dbd7 100644 --- a/pkg/cluster/clusterName.go +++ b/pkg/cluster/clusterName.go @@ -24,7 +24,7 @@ package cluster import ( "fmt" - "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/pkg/types" ) // CheckName ensures that a cluster name is also a valid host name according to RFC 1123. diff --git a/pkg/cluster/host.go b/pkg/cluster/host.go index 2750c9cd..316b9305 100644 --- a/pkg/cluster/host.go +++ b/pkg/cluster/host.go @@ -29,9 +29,9 @@ import ( "regexp" "runtime" - rt "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - "github.com/rancher/k3d/v3/pkg/util" + rt "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v4/pkg/util" log "github.com/sirupsen/logrus" ) diff --git a/pkg/cluster/kubeconfig.go b/pkg/cluster/kubeconfig.go index 3d9466e8..739da705 100644 --- a/pkg/cluster/kubeconfig.go +++ b/pkg/cluster/kubeconfig.go @@ -30,8 +30,8 @@ import ( "path" "time" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/pkg/cluster/loadbalancer.go b/pkg/cluster/loadbalancer.go index 6ee50287..7b0a6b35 100644 --- a/pkg/cluster/loadbalancer.go +++ b/pkg/cluster/loadbalancer.go @@ -26,8 +26,8 @@ import ( "fmt" "strings" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/cluster/node.go b/pkg/cluster/node.go index 230897e4..f7d6ec50 100644 --- a/pkg/cluster/node.go +++ b/pkg/cluster/node.go @@ -30,8 +30,8 @@ import ( "time" "github.com/imdario/mergo" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" ) diff --git a/pkg/runtimes/containerd/kubeconfig.go b/pkg/runtimes/containerd/kubeconfig.go index 683a0810..165ba2c2 100644 --- a/pkg/runtimes/containerd/kubeconfig.go +++ b/pkg/runtimes/containerd/kubeconfig.go @@ -26,7 +26,7 @@ import ( "context" "io" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" ) // GetKubeconfig grabs the kubeconfig from inside a k3d node diff --git a/pkg/runtimes/containerd/node.go b/pkg/runtimes/containerd/node.go index 366a64b8..f2d9c9c0 100644 --- a/pkg/runtimes/containerd/node.go +++ b/pkg/runtimes/containerd/node.go @@ -30,7 +30,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/containers" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/containerd/util.go b/pkg/runtimes/containerd/util.go index db7ff8d8..d0c483d8 100644 --- a/pkg/runtimes/containerd/util.go +++ b/pkg/runtimes/containerd/util.go @@ -24,7 +24,7 @@ package containerd import ( "context" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" ) // CopyToNode copies a file from the local FS to the selected node diff --git a/pkg/runtimes/docker/container.go b/pkg/runtimes/docker/container.go index 4e53d87d..5750386c 100644 --- a/pkg/runtimes/docker/container.go +++ b/pkg/runtimes/docker/container.go @@ -33,7 +33,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/kubeconfig.go b/pkg/runtimes/docker/kubeconfig.go index 8f4a7d28..a96c5057 100644 --- a/pkg/runtimes/docker/kubeconfig.go +++ b/pkg/runtimes/docker/kubeconfig.go @@ -27,7 +27,7 @@ import ( "io" "github.com/docker/docker/client" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/network.go b/pkg/runtimes/docker/network.go index f4929e02..8325ed16 100644 --- a/pkg/runtimes/docker/network.go +++ b/pkg/runtimes/docker/network.go @@ -30,7 +30,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/node.go b/pkg/runtimes/docker/node.go index 27867e05..68c034a4 100644 --- a/pkg/runtimes/docker/node.go +++ b/pkg/runtimes/docker/node.go @@ -33,7 +33,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/translate.go b/pkg/runtimes/docker/translate.go index 414ff012..873419e1 100644 --- a/pkg/runtimes/docker/translate.go +++ b/pkg/runtimes/docker/translate.go @@ -31,7 +31,7 @@ import ( docker "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" dockercliopts "github.com/docker/cli/opts" diff --git a/pkg/runtimes/docker/translate_test.go b/pkg/runtimes/docker/translate_test.go index 78f89c4c..e656343e 100644 --- a/pkg/runtimes/docker/translate_test.go +++ b/pkg/runtimes/docker/translate_test.go @@ -30,7 +30,7 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" ) func TestTranslateNodeToContainer(t *testing.T) { diff --git a/pkg/runtimes/docker/util.go b/pkg/runtimes/docker/util.go index 757b27a2..68f49461 100644 --- a/pkg/runtimes/docker/util.go +++ b/pkg/runtimes/docker/util.go @@ -29,7 +29,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/volume.go b/pkg/runtimes/docker/volume.go index 9203ad69..7ec86854 100644 --- a/pkg/runtimes/docker/volume.go +++ b/pkg/runtimes/docker/volume.go @@ -28,7 +28,7 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" "github.com/docker/docker/client" - k3d "github.com/rancher/k3d/v3/pkg/types" + k3d "github.com/rancher/k3d/v4/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/runtime.go b/pkg/runtimes/runtime.go index cc7f3a98..4050c6bf 100644 --- a/pkg/runtimes/runtime.go +++ b/pkg/runtimes/runtime.go @@ -29,9 +29,9 @@ import ( "net" "time" - "github.com/rancher/k3d/v3/pkg/runtimes/containerd" - "github.com/rancher/k3d/v3/pkg/runtimes/docker" - k3d "github.com/rancher/k3d/v3/pkg/types" + "github.com/rancher/k3d/v4/pkg/runtimes/containerd" + "github.com/rancher/k3d/v4/pkg/runtimes/docker" + k3d "github.com/rancher/k3d/v4/pkg/types" ) // SelectedRuntime is a runtime (pun intended) variable determining the selected runtime diff --git a/pkg/tools/tools.go b/pkg/tools/tools.go index 2f386de2..ad4594ab 100644 --- a/pkg/tools/tools.go +++ b/pkg/tools/tools.go @@ -30,10 +30,10 @@ import ( "sync" "time" - k3dc "github.com/rancher/k3d/v3/pkg/cluster" - "github.com/rancher/k3d/v3/pkg/runtimes" - k3d "github.com/rancher/k3d/v3/pkg/types" - "github.com/rancher/k3d/v3/version" + k3dc "github.com/rancher/k3d/v4/pkg/cluster" + "github.com/rancher/k3d/v4/pkg/runtimes" + k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v4/version" log "github.com/sirupsen/logrus" )