From 7073a8fad79fbf8c949f14eca34aa16b145f735f Mon Sep 17 00:00:00 2001 From: iwilltry42 Date: Tue, 7 Sep 2021 08:55:09 +0200 Subject: [PATCH] migrate to module rancher/k3d/v5 --- Makefile | 4 ++-- README.md | 4 ++-- cmd/cluster/cluster.go | 2 +- cmd/cluster/clusterCreate.go | 18 +++++++++--------- cmd/cluster/clusterDelete.go | 14 +++++++------- cmd/cluster/clusterEdit.go | 14 +++++++------- cmd/cluster/clusterList.go | 10 +++++----- cmd/cluster/clusterStart.go | 12 ++++++------ cmd/cluster/clusterStop.go | 10 +++++----- cmd/config/config.go | 2 +- cmd/config/configInit.go | 4 ++-- cmd/config/configMigrate.go | 4 ++-- cmd/debug/debug.go | 10 +++++----- cmd/image/image.go | 2 +- cmd/image/imageImport.go | 10 +++++----- cmd/kubeconfig/kubeconfig.go | 2 +- cmd/kubeconfig/kubeconfigGet.go | 10 +++++----- cmd/kubeconfig/kubeconfigMerge.go | 12 ++++++------ cmd/node/node.go | 2 +- cmd/node/nodeCreate.go | 14 +++++++------- cmd/node/nodeDelete.go | 10 +++++----- cmd/node/nodeEdit.go | 10 +++++----- cmd/node/nodeList.go | 10 +++++----- cmd/node/nodeStart.go | 8 ++++---- cmd/node/nodeStop.go | 8 ++++---- cmd/registry/registry.go | 2 +- cmd/registry/registryCreate.go | 10 +++++----- cmd/registry/registryDelete.go | 10 +++++----- cmd/registry/registryList.go | 10 +++++----- cmd/root.go | 22 +++++++++++----------- cmd/util/completion.go | 8 ++++---- cmd/util/config/config.go | 4 ++-- cmd/util/filter.go | 2 +- cmd/util/listings.go | 4 ++-- cmd/util/plugins.go | 2 +- cmd/util/ports.go | 6 +++--- cmd/util/runtimeLabels.go | 2 +- cmd/util/volumes.go | 4 ++-- docgen/go.mod | 4 ++-- docgen/main.go | 4 ++-- go.mod | 2 +- main.go | 2 +- pkg/actions/nodehooks.go | 4 ++-- pkg/client/cluster.go | 20 ++++++++++---------- pkg/client/clusterName.go | 2 +- pkg/client/environment.go | 6 +++--- pkg/client/fixes.go | 6 +++--- pkg/client/host.go | 8 ++++---- pkg/client/ipam.go | 6 +++--- pkg/client/kubeconfig.go | 6 +++--- pkg/client/loadbalancer.go | 8 ++++---- pkg/client/node.go | 16 ++++++++-------- pkg/client/ports.go | 12 ++++++------ pkg/client/registry.go | 12 ++++++------ pkg/client/registry_test.go | 4 ++-- pkg/client/tools.go | 6 +++--- pkg/config/config.go | 10 +++++----- pkg/config/config_test.go | 6 +++--- pkg/config/jsonschema.go | 2 +- pkg/config/jsonschema_test.go | 2 +- pkg/config/merge.go | 4 ++-- pkg/config/merge_test.go | 4 ++-- pkg/config/migrate.go | 2 +- pkg/config/process.go | 4 ++-- pkg/config/process_test.go | 4 ++-- pkg/config/transform.go | 18 +++++++++--------- pkg/config/transform_test.go | 4 ++-- pkg/config/v1alpha2/types.go | 6 +++--- pkg/config/v1alpha3/migrations.go | 6 +++--- pkg/config/v1alpha3/types.go | 6 +++--- pkg/config/validate.go | 10 +++++----- pkg/config/validate_test.go | 4 ++-- pkg/runtimes/docker/container.go | 4 ++-- pkg/runtimes/docker/docker.go | 2 +- pkg/runtimes/docker/info.go | 2 +- pkg/runtimes/docker/kubeconfig.go | 4 ++-- pkg/runtimes/docker/machine.go | 2 +- pkg/runtimes/docker/network.go | 8 ++++---- pkg/runtimes/docker/node.go | 6 +++--- pkg/runtimes/docker/translate.go | 8 ++++---- pkg/runtimes/docker/translate_test.go | 4 ++-- pkg/runtimes/docker/util.go | 6 +++--- pkg/runtimes/docker/volume.go | 4 ++-- pkg/runtimes/runtime.go | 6 +++--- pkg/runtimes/util/volumes.go | 4 ++-- pkg/types/images.go | 4 ++-- pkg/types/types.go | 4 ++-- pkg/util/filter.go | 4 ++-- pkg/util/registry.go | 2 +- version/version.go | 2 +- 90 files changed, 294 insertions(+), 294 deletions(-) diff --git a/Makefile b/Makefile index 19a78096..7320cacb 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ PKG := $(shell go mod vendor) TAGS := TESTS := ./... TESTFLAGS := -LDFLAGS := -w -s -X github.com/rancher/k3d/v4/version.Version=${GIT_TAG} -X github.com/rancher/k3d/v4/version.K3sVersion=${K3S_TAG} +LDFLAGS := -w -s -X github.com/rancher/k3d/v5/version.Version=${GIT_TAG} -X github.com/rancher/k3d/v5/version.K3sVersion=${K3S_TAG} GCFLAGS := GOFLAGS := BINDIR := $(CURDIR)/bin @@ -74,7 +74,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/v4/version.HelperVersionOverride=${K3D_HELPER_VERSION} +LDFLAGS += -X github.com/rancher/k3d/v5/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 81728058..9557dca1 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%2Fv4-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/rancher/k3d/v4) +[![Go Module](https://img.shields.io/badge/Go%20Module-github.com%2Francher%2Fk3d%2Fv4-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/rancher/k3d/v5) [![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) @@ -69,7 +69,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/v4@main` +1. Clone this repo, e.g. via `git clone git@github.com:rancher/k3d.git` or `go get github.com/rancher/k3d/v5@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/cluster.go b/cmd/cluster/cluster.go index 708cf5ed..8ddb63b1 100644 --- a/cmd/cluster/cluster.go +++ b/cmd/cluster/cluster.go @@ -22,7 +22,7 @@ THE SOFTWARE. package cluster import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/cluster/clusterCreate.go b/cmd/cluster/clusterCreate.go index b76e301f..f2beee8f 100644 --- a/cmd/cluster/clusterCreate.go +++ b/cmd/cluster/clusterCreate.go @@ -37,15 +37,15 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v2" - cliutil "github.com/rancher/k3d/v4/cmd/util" - cliconfig "github.com/rancher/k3d/v4/cmd/util/config" - k3dCluster "github.com/rancher/k3d/v4/pkg/client" - "github.com/rancher/k3d/v4/pkg/config" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/version" + cliutil "github.com/rancher/k3d/v5/cmd/util" + cliconfig "github.com/rancher/k3d/v5/cmd/util/config" + k3dCluster "github.com/rancher/k3d/v5/pkg/client" + "github.com/rancher/k3d/v5/pkg/config" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/version" ) var configFile string diff --git a/cmd/cluster/clusterDelete.go b/cmd/cluster/clusterDelete.go index de16aa7c..cd552d8c 100644 --- a/cmd/cluster/clusterDelete.go +++ b/cmd/cluster/clusterDelete.go @@ -26,13 +26,13 @@ import ( "os" "path" - "github.com/rancher/k3d/v4/cmd/util" - cliconfig "github.com/rancher/k3d/v4/cmd/util/config" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "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/rancher/k3d/v5/cmd/util" + cliconfig "github.com/rancher/k3d/v5/cmd/util/config" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + k3dutil "github.com/rancher/k3d/v5/pkg/util" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/cmd/cluster/clusterEdit.go b/cmd/cluster/clusterEdit.go index 3f8846d0..1a01510a 100644 --- a/cmd/cluster/clusterEdit.go +++ b/cmd/cluster/clusterEdit.go @@ -22,13 +22,13 @@ THE SOFTWARE. package cluster import ( - "github.com/rancher/k3d/v4/cmd/util" - cliutil "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + cliutil "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/cluster/clusterList.go b/cmd/cluster/clusterList.go index e74b3b34..a50292fc 100644 --- a/cmd/cluster/clusterList.go +++ b/cmd/cluster/clusterList.go @@ -28,11 +28,11 @@ import ( "os" "strings" - "github.com/rancher/k3d/v4/cmd/util" - k3cluster "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + k3cluster "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" "gopkg.in/yaml.v2" diff --git a/cmd/cluster/clusterStart.go b/cmd/cluster/clusterStart.go index 7acf7c37..1a545f66 100644 --- a/cmd/cluster/clusterStart.go +++ b/cmd/cluster/clusterStart.go @@ -24,14 +24,14 @@ package cluster import ( "time" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // NewCmdClusterStart returns a new cobra command diff --git a/cmd/cluster/clusterStop.go b/cmd/cluster/clusterStop.go index 000ac530..1ec86c08 100644 --- a/cmd/cluster/clusterStop.go +++ b/cmd/cluster/clusterStop.go @@ -24,11 +24,11 @@ package cluster import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // NewCmdClusterStop returns a new cobra command diff --git a/cmd/config/config.go b/cmd/config/config.go index f1a329f4..e67df1e2 100644 --- a/cmd/config/config.go +++ b/cmd/config/config.go @@ -22,7 +22,7 @@ THE SOFTWARE. package config import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/configInit.go b/cmd/config/configInit.go index 7e58ecdb..b43bd00c 100644 --- a/cmd/config/configInit.go +++ b/cmd/config/configInit.go @@ -25,8 +25,8 @@ import ( "fmt" "os" - config "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" + config "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/configMigrate.go b/cmd/config/configMigrate.go index fa32725c..4b79615f 100644 --- a/cmd/config/configMigrate.go +++ b/cmd/config/configMigrate.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/rancher/k3d/v4/pkg/config" - l "github.com/rancher/k3d/v4/pkg/logger" + "github.com/rancher/k3d/v5/pkg/config" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" "github.com/spf13/viper" "gopkg.in/yaml.v2" diff --git a/cmd/debug/debug.go b/cmd/debug/debug.go index 69bd7044..5bd10802 100644 --- a/cmd/debug/debug.go +++ b/cmd/debug/debug.go @@ -24,11 +24,11 @@ package debug import ( "fmt" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/cmd/image/image.go b/cmd/image/image.go index da1cafda..e1c58e8b 100644 --- a/cmd/image/image.go +++ b/cmd/image/image.go @@ -22,7 +22,7 @@ THE SOFTWARE. package image import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/image/imageImport.go b/cmd/image/imageImport.go index 0fe9f6e4..e3b847f5 100644 --- a/cmd/image/imageImport.go +++ b/cmd/image/imageImport.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/cobra" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // NewCmdImageImport returns a new cobra command diff --git a/cmd/kubeconfig/kubeconfig.go b/cmd/kubeconfig/kubeconfig.go index 30416468..ed7c77c7 100644 --- a/cmd/kubeconfig/kubeconfig.go +++ b/cmd/kubeconfig/kubeconfig.go @@ -22,7 +22,7 @@ THE SOFTWARE. package kubeconfig import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/kubeconfig/kubeconfigGet.go b/cmd/kubeconfig/kubeconfigGet.go index 1c4b88b2..c8c82f7c 100644 --- a/cmd/kubeconfig/kubeconfigGet.go +++ b/cmd/kubeconfig/kubeconfigGet.go @@ -25,11 +25,11 @@ import ( "fmt" "os" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/kubeconfig/kubeconfigMerge.go b/cmd/kubeconfig/kubeconfigMerge.go index 2cecd741..dd5b84fd 100644 --- a/cmd/kubeconfig/kubeconfigMerge.go +++ b/cmd/kubeconfig/kubeconfigMerge.go @@ -27,12 +27,12 @@ import ( "path" "strings" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "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/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + k3dutil "github.com/rancher/k3d/v5/pkg/util" "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" ) diff --git a/cmd/node/node.go b/cmd/node/node.go index 5df4bf34..7f879454 100644 --- a/cmd/node/node.go +++ b/cmd/node/node.go @@ -22,7 +22,7 @@ THE SOFTWARE. package node import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeCreate.go b/cmd/node/nodeCreate.go index 31cbec44..5cfea6d8 100644 --- a/cmd/node/nodeCreate.go +++ b/cmd/node/nodeCreate.go @@ -29,13 +29,13 @@ import ( "github.com/spf13/cobra" dockerunits "github.com/docker/go-units" - "github.com/rancher/k3d/v4/cmd/util" - cliutil "github.com/rancher/k3d/v4/cmd/util" - k3dc "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/version" + "github.com/rancher/k3d/v5/cmd/util" + cliutil "github.com/rancher/k3d/v5/cmd/util" + k3dc "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/version" ) // NewCmdNodeCreate returns a new cobra command diff --git a/cmd/node/nodeDelete.go b/cmd/node/nodeDelete.go index 50f253c3..eaa6cfb0 100644 --- a/cmd/node/nodeDelete.go +++ b/cmd/node/nodeDelete.go @@ -22,11 +22,11 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeEdit.go b/cmd/node/nodeEdit.go index fafc0567..06a1a72f 100644 --- a/cmd/node/nodeEdit.go +++ b/cmd/node/nodeEdit.go @@ -23,11 +23,11 @@ package node import ( "github.com/docker/go-connections/nat" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeList.go b/cmd/node/nodeList.go index 23d80ae4..f7dd536d 100644 --- a/cmd/node/nodeList.go +++ b/cmd/node/nodeList.go @@ -26,11 +26,11 @@ import ( "strings" "github.com/liggitt/tabwriter" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeStart.go b/cmd/node/nodeStart.go index 5208ab92..1886d583 100644 --- a/cmd/node/nodeStart.go +++ b/cmd/node/nodeStart.go @@ -22,10 +22,10 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v4/cmd/util" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeStop.go b/cmd/node/nodeStop.go index 6905238f..8d0cb38e 100644 --- a/cmd/node/nodeStop.go +++ b/cmd/node/nodeStop.go @@ -22,12 +22,12 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/runtimes" "github.com/spf13/cobra" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // NewCmdNodeStop returns a new cobra command diff --git a/cmd/registry/registry.go b/cmd/registry/registry.go index 6c86ab9a..504392b9 100644 --- a/cmd/registry/registry.go +++ b/cmd/registry/registry.go @@ -22,7 +22,7 @@ THE SOFTWARE. package registry import ( - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryCreate.go b/cmd/registry/registryCreate.go index 08cb302d..3eaa4285 100644 --- a/cmd/registry/registryCreate.go +++ b/cmd/registry/registryCreate.go @@ -24,14 +24,14 @@ package registry import ( "fmt" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v4/pkg/client" + "github.com/rancher/k3d/v5/pkg/client" - cliutil "github.com/rancher/k3d/v4/cmd/util" + cliutil "github.com/rancher/k3d/v5/cmd/util" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryDelete.go b/cmd/registry/registryDelete.go index 5bab2d8a..5cc1e17d 100644 --- a/cmd/registry/registryDelete.go +++ b/cmd/registry/registryDelete.go @@ -22,11 +22,11 @@ THE SOFTWARE. package registry import ( - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryList.go b/cmd/registry/registryList.go index 4060aea1..c23d46f3 100644 --- a/cmd/registry/registryList.go +++ b/cmd/registry/registryList.go @@ -26,11 +26,11 @@ import ( "strings" "github.com/liggitt/tabwriter" - "github.com/rancher/k3d/v4/cmd/util" - "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/cmd/util" + "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index 35f14d32..3ecab49f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -32,17 +32,17 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "github.com/rancher/k3d/v4/cmd/cluster" - cfg "github.com/rancher/k3d/v4/cmd/config" - "github.com/rancher/k3d/v4/cmd/debug" - "github.com/rancher/k3d/v4/cmd/image" - "github.com/rancher/k3d/v4/cmd/kubeconfig" - "github.com/rancher/k3d/v4/cmd/node" - "github.com/rancher/k3d/v4/cmd/registry" - cliutil "github.com/rancher/k3d/v4/cmd/util" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/version" + "github.com/rancher/k3d/v5/cmd/cluster" + cfg "github.com/rancher/k3d/v5/cmd/config" + "github.com/rancher/k3d/v5/cmd/debug" + "github.com/rancher/k3d/v5/cmd/image" + "github.com/rancher/k3d/v5/cmd/kubeconfig" + "github.com/rancher/k3d/v5/cmd/node" + "github.com/rancher/k3d/v5/cmd/registry" + cliutil "github.com/rancher/k3d/v5/cmd/util" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/version" "github.com/sirupsen/logrus" "github.com/sirupsen/logrus/hooks/writer" ) diff --git a/cmd/util/completion.go b/cmd/util/completion.go index 78185551..40bfbc48 100644 --- a/cmd/util/completion.go +++ b/cmd/util/completion.go @@ -25,10 +25,10 @@ import ( "context" "strings" - k3dcluster "github.com/rancher/k3d/v4/pkg/client" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3dcluster "github.com/rancher/k3d/v5/pkg/client" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/util/config/config.go b/cmd/util/config/config.go index c5a37756..c40831c4 100644 --- a/cmd/util/config/config.go +++ b/cmd/util/config/config.go @@ -28,8 +28,8 @@ import ( "path/filepath" "strings" - "github.com/rancher/k3d/v4/pkg/config" - l "github.com/rancher/k3d/v4/pkg/logger" + "github.com/rancher/k3d/v5/pkg/config" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/sirupsen/logrus" "github.com/spf13/viper" "gopkg.in/yaml.v2" diff --git a/cmd/util/filter.go b/cmd/util/filter.go index 5f439bd3..52ed4c36 100644 --- a/cmd/util/filter.go +++ b/cmd/util/filter.go @@ -25,7 +25,7 @@ import ( "fmt" "strings" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // SplitFiltersFromFlag separates a flag's value from the node filter, if there is one diff --git a/cmd/util/listings.go b/cmd/util/listings.go index 587a6bcf..4586b160 100644 --- a/cmd/util/listings.go +++ b/cmd/util/listings.go @@ -29,8 +29,8 @@ import ( "strings" "github.com/liggitt/tabwriter" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" "gopkg.in/yaml.v2" ) diff --git a/cmd/util/plugins.go b/cmd/util/plugins.go index e1e28b84..9e05c106 100644 --- a/cmd/util/plugins.go +++ b/cmd/util/plugins.go @@ -28,7 +28,7 @@ import ( "os/exec" "strings" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3d "github.com/rancher/k3d/v5/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 f9759dbf..66eaa49f 100644 --- a/cmd/util/ports.go +++ b/cmd/util/ports.go @@ -28,9 +28,9 @@ import ( "strconv" "github.com/docker/go-connections/nat" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/util" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/util" ) var apiPortRegexp = regexp.MustCompile(`^(?P(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?P\S+):)?(?P(\d{1,5}|random))$`) diff --git a/cmd/util/runtimeLabels.go b/cmd/util/runtimeLabels.go index 6a9747d0..5b61d5ce 100644 --- a/cmd/util/runtimeLabels.go +++ b/cmd/util/runtimeLabels.go @@ -24,7 +24,7 @@ package util import ( "strings" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // validateRuntimeLabelKey validates a given label key is not reserved for internal k3d usage diff --git a/cmd/util/volumes.go b/cmd/util/volumes.go index 3282ee58..7238aa2f 100644 --- a/cmd/util/volumes.go +++ b/cmd/util/volumes.go @@ -27,9 +27,9 @@ import ( rt "runtime" "strings" - "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/runtimes" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // ValidateVolumeMount checks, if the source of volume mounts exists and if the destination is an absolute path diff --git a/docgen/go.mod b/docgen/go.mod index 33a899db..5088a585 100644 --- a/docgen/go.mod +++ b/docgen/go.mod @@ -9,7 +9,7 @@ require ( github.com/containerd/continuity v0.0.0-20210315143101-93e15499afd5 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/rancher/k3d/v4 v4.4.7-0.20210709062205-c5f7884f7870 + github.com/rancher/k3d/v5 v4.4.7-0.20210709062205-c5f7884f7870 github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.2.1 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1 // indirect @@ -19,4 +19,4 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.1.1 // indirect ) -replace github.com/rancher/k3d/v4 => /PATH/TO/YOUR/REPO/DIRECTORY +replace github.com/rancher/k3d/v5 => /PATH/TO/YOUR/REPO/DIRECTORY diff --git a/docgen/main.go b/docgen/main.go index 9e49b5ef..8e98225c 100644 --- a/docgen/main.go +++ b/docgen/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/rancher/k3d/v4/cmd" - l "github.com/rancher/k3d/v4/pkg/logger" + "github.com/rancher/k3d/v5/cmd" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/cobra/doc" ) diff --git a/go.mod b/go.mod index 13b18752..4c39ab15 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/k3d/v4 +module github.com/rancher/k3d/v5 go 1.17 diff --git a/main.go b/main.go index 59a1fbba..eb59e30f 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ THE SOFTWARE. */ package main -import "github.com/rancher/k3d/v4/cmd" +import "github.com/rancher/k3d/v5/cmd" func main() { cmd.Execute() diff --git a/pkg/actions/nodehooks.go b/pkg/actions/nodehooks.go index a37577f7..d987dd42 100644 --- a/pkg/actions/nodehooks.go +++ b/pkg/actions/nodehooks.go @@ -25,8 +25,8 @@ import ( "context" "os" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" ) type WriteFileAction struct { diff --git a/pkg/client/cluster.go b/pkg/client/cluster.go index 448cb1c8..e52aebcf 100644 --- a/pkg/client/cluster.go +++ b/pkg/client/cluster.go @@ -36,16 +36,16 @@ import ( "github.com/docker/go-connections/nat" "github.com/imdario/mergo" copystruct "github.com/mitchellh/copystructure" - "github.com/rancher/k3d/v4/pkg/actions" - config "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" - k3drt "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/runtimes/docker" - runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors" - "github.com/rancher/k3d/v4/pkg/types" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/k3s" - "github.com/rancher/k3d/v4/pkg/util" + "github.com/rancher/k3d/v5/pkg/actions" + config "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" + k3drt "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/runtimes/docker" + runtimeErr "github.com/rancher/k3d/v5/pkg/runtimes/errors" + "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/k3s" + "github.com/rancher/k3d/v5/pkg/util" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" "gopkg.in/yaml.v2" diff --git a/pkg/client/clusterName.go b/pkg/client/clusterName.go index 9f3b3dc3..6cb1791c 100644 --- a/pkg/client/clusterName.go +++ b/pkg/client/clusterName.go @@ -24,7 +24,7 @@ package client import ( "fmt" - "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/pkg/types" ) // CheckName ensures that a cluster name is also a valid host name according to RFC 1123. diff --git a/pkg/client/environment.go b/pkg/client/environment.go index 2a82674d..2294e8d5 100644 --- a/pkg/client/environment.go +++ b/pkg/client/environment.go @@ -25,10 +25,10 @@ import ( "context" "fmt" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3d "github.com/rancher/k3d/v5/pkg/types" ) func GatherEnvironmentInfo(ctx context.Context, runtime runtimes.Runtime, cluster *k3d.Cluster) (*k3d.EnvironmentInfo, error) { diff --git a/pkg/client/fixes.go b/pkg/client/fixes.go index 49d7e19f..2bd30cc8 100644 --- a/pkg/client/fixes.go +++ b/pkg/client/fixes.go @@ -25,9 +25,9 @@ import ( "os" "strconv" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/types/fixes" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/types/fixes" ) // FIXME: FixCgroupV2 - to be removed when fixed upstream diff --git a/pkg/client/host.go b/pkg/client/host.go index 8269b9fb..2a14ab52 100644 --- a/pkg/client/host.go +++ b/pkg/client/host.go @@ -29,10 +29,10 @@ import ( "regexp" "runtime" - l "github.com/rancher/k3d/v4/pkg/logger" - rt "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/util" + l "github.com/rancher/k3d/v5/pkg/logger" + rt "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/util" ) var nsLookupAddressRegexp = regexp.MustCompile(`^Address:\s+(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$`) diff --git a/pkg/client/ipam.go b/pkg/client/ipam.go index 9eba19ca..dae1f85d 100644 --- a/pkg/client/ipam.go +++ b/pkg/client/ipam.go @@ -25,9 +25,9 @@ import ( "context" "fmt" - l "github.com/rancher/k3d/v4/pkg/logger" - k3drt "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3drt "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "inet.af/netaddr" ) diff --git a/pkg/client/kubeconfig.go b/pkg/client/kubeconfig.go index 3185b5b4..38902bd4 100644 --- a/pkg/client/kubeconfig.go +++ b/pkg/client/kubeconfig.go @@ -30,9 +30,9 @@ import ( "path/filepath" "time" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/pkg/client/loadbalancer.go b/pkg/client/loadbalancer.go index e72233d1..7189b914 100644 --- a/pkg/client/loadbalancer.go +++ b/pkg/client/loadbalancer.go @@ -33,10 +33,10 @@ import ( "github.com/docker/go-connections/nat" "github.com/go-test/deep" "github.com/imdario/mergo" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/types" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/spf13/viper" "gopkg.in/yaml.v2" ) diff --git a/pkg/client/node.go b/pkg/client/node.go index 2bc9d6cb..c763c1d8 100644 --- a/pkg/client/node.go +++ b/pkg/client/node.go @@ -40,14 +40,14 @@ import ( "github.com/docker/go-connections/nat" dockerunits "github.com/docker/go-units" "github.com/imdario/mergo" - "github.com/rancher/k3d/v4/pkg/actions" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/runtimes/docker" - runtimeErrors "github.com/rancher/k3d/v4/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/fixes" - "github.com/rancher/k3d/v4/pkg/util" + "github.com/rancher/k3d/v5/pkg/actions" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/runtimes/docker" + runtimeErrors "github.com/rancher/k3d/v5/pkg/runtimes/errors" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/fixes" + "github.com/rancher/k3d/v5/pkg/util" "golang.org/x/sync/errgroup" ) diff --git a/pkg/client/ports.go b/pkg/client/ports.go index 068cd84e..c05a536f 100644 --- a/pkg/client/ports.go +++ b/pkg/client/ports.go @@ -28,12 +28,12 @@ import ( "strings" "github.com/docker/go-connections/nat" - "github.com/rancher/k3d/v4/pkg/config/types" - config "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/util" + "github.com/rancher/k3d/v5/pkg/config/types" + config "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/util" "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" ) diff --git a/pkg/client/registry.go b/pkg/client/registry.go index e5d8695e..0e08957c 100644 --- a/pkg/client/registry.go +++ b/pkg/client/registry.go @@ -28,12 +28,12 @@ import ( "github.com/docker/go-connections/nat" "github.com/imdario/mergo" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - "github.com/rancher/k3d/v4/pkg/runtimes/docker" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/k3s" - "github.com/rancher/k3d/v4/pkg/types/k8s" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/runtimes/docker" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/k3s" + "github.com/rancher/k3d/v5/pkg/types/k8s" "gopkg.in/yaml.v2" ) diff --git a/pkg/client/registry_test.go b/pkg/client/registry_test.go index 0d0d3ef0..7ead8da8 100644 --- a/pkg/client/registry_test.go +++ b/pkg/client/registry_test.go @@ -27,8 +27,8 @@ import ( "testing" "github.com/docker/go-connections/nat" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" ) func TestRegistryGenerateLocalRegistryHostingConfigMapYAML(t *testing.T) { diff --git a/pkg/client/tools.go b/pkg/client/tools.go index 91f5bf3c..69efa69f 100644 --- a/pkg/client/tools.go +++ b/pkg/client/tools.go @@ -31,9 +31,9 @@ import ( "sync" "time" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // ImageImportIntoClusterMulti starts up a k3d tools container for the selected cluster and uses it to export diff --git a/pkg/config/config.go b/pkg/config/config.go index 34399d6d..624dc03a 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -25,15 +25,15 @@ import ( "fmt" "strings" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" "github.com/spf13/viper" - "github.com/rancher/k3d/v4/pkg/config/v1alpha2" - "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - defaultConfig "github.com/rancher/k3d/v4/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/config/v1alpha2" + "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + defaultConfig "github.com/rancher/k3d/v5/pkg/config/v1alpha3" - types "github.com/rancher/k3d/v4/pkg/config/types" + types "github.com/rancher/k3d/v5/pkg/config/types" ) const DefaultConfigApiVersion = defaultConfig.ApiVersion diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index 7b0c08da..608b55a9 100644 --- a/pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -26,11 +26,11 @@ import ( "time" "github.com/go-test/deep" - configtypes "github.com/rancher/k3d/v4/pkg/config/types" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" + configtypes "github.com/rancher/k3d/v5/pkg/config/types" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" "github.com/spf13/viper" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3d "github.com/rancher/k3d/v5/pkg/types" ) func TestReadSimpleConfig(t *testing.T) { diff --git a/pkg/config/jsonschema.go b/pkg/config/jsonschema.go index c1c3cecd..11698464 100644 --- a/pkg/config/jsonschema.go +++ b/pkg/config/jsonschema.go @@ -32,7 +32,7 @@ import ( "github.com/xeipuuv/gojsonschema" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // ValidateSchemaFile takes a filepath, reads the file and validates it against a JSON schema diff --git a/pkg/config/jsonschema_test.go b/pkg/config/jsonschema_test.go index f3ec75b6..e3df2d40 100644 --- a/pkg/config/jsonschema_test.go +++ b/pkg/config/jsonschema_test.go @@ -24,7 +24,7 @@ package config import ( "testing" - "github.com/rancher/k3d/v4/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/config/v1alpha3" ) func TestValidateSchema(t *testing.T) { diff --git a/pkg/config/merge.go b/pkg/config/merge.go index 0a36f7c3..88188291 100644 --- a/pkg/config/merge.go +++ b/pkg/config/merge.go @@ -26,8 +26,8 @@ import ( "fmt" "github.com/imdario/mergo" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" ) // MergeSimple merges two simple configuration files with the values of the destination one having priority diff --git a/pkg/config/merge_test.go b/pkg/config/merge_test.go index cfb73b72..aef6ccc3 100644 --- a/pkg/config/merge_test.go +++ b/pkg/config/merge_test.go @@ -25,8 +25,8 @@ package config import ( "testing" - configtypes "github.com/rancher/k3d/v4/pkg/config/types" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" + configtypes "github.com/rancher/k3d/v5/pkg/config/types" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" "github.com/spf13/viper" "gotest.tools/assert" ) diff --git a/pkg/config/migrate.go b/pkg/config/migrate.go index 28fb5d1f..d0040d80 100644 --- a/pkg/config/migrate.go +++ b/pkg/config/migrate.go @@ -25,7 +25,7 @@ package config import ( "fmt" - types "github.com/rancher/k3d/v4/pkg/config/types" + types "github.com/rancher/k3d/v5/pkg/config/types" ) func Migrate(config types.Config, targetVersion string) (types.Config, error) { diff --git a/pkg/config/process.go b/pkg/config/process.go index a2dda855..79bd3f43 100644 --- a/pkg/config/process.go +++ b/pkg/config/process.go @@ -23,8 +23,8 @@ THE SOFTWARE. package config import ( - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v4/pkg/logger" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + l "github.com/rancher/k3d/v5/pkg/logger" ) // ProcessClusterConfig applies processing to the config sanitizing it and doing diff --git a/pkg/config/process_test.go b/pkg/config/process_test.go index 4d68355e..47b1fc77 100644 --- a/pkg/config/process_test.go +++ b/pkg/config/process_test.go @@ -26,8 +26,8 @@ import ( "context" "testing" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - "github.com/rancher/k3d/v4/pkg/runtimes" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/runtimes" "github.com/spf13/viper" "gotest.tools/assert" ) diff --git a/pkg/config/transform.go b/pkg/config/transform.go index 7e30ae4f..79f50c1f 100644 --- a/pkg/config/transform.go +++ b/pkg/config/transform.go @@ -30,18 +30,18 @@ import ( "strings" "github.com/docker/go-connections/nat" - cliutil "github.com/rancher/k3d/v4/cmd/util" // TODO: move parseapiport to pkg - "github.com/rancher/k3d/v4/pkg/client" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - "github.com/rancher/k3d/v4/pkg/runtimes" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/k3s" - "github.com/rancher/k3d/v4/pkg/util" - "github.com/rancher/k3d/v4/version" + cliutil "github.com/rancher/k3d/v5/cmd/util" // TODO: move parseapiport to pkg + "github.com/rancher/k3d/v5/pkg/client" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/runtimes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/k3s" + "github.com/rancher/k3d/v5/pkg/util" + "github.com/rancher/k3d/v5/version" "gopkg.in/yaml.v2" "inet.af/netaddr" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) var ( diff --git a/pkg/config/transform_test.go b/pkg/config/transform_test.go index 495f499c..cffd8860 100644 --- a/pkg/config/transform_test.go +++ b/pkg/config/transform_test.go @@ -26,8 +26,8 @@ import ( "context" "testing" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - "github.com/rancher/k3d/v4/pkg/runtimes" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/runtimes" "github.com/spf13/viper" ) diff --git a/pkg/config/v1alpha2/types.go b/pkg/config/v1alpha2/types.go index 9f2375d1..c7806878 100644 --- a/pkg/config/v1alpha2/types.go +++ b/pkg/config/v1alpha2/types.go @@ -27,9 +27,9 @@ import ( "fmt" "time" - configtypes "github.com/rancher/k3d/v4/pkg/config/types" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/version" + configtypes "github.com/rancher/k3d/v5/pkg/config/types" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/version" ) // JSONSchema describes the schema used to validate config files diff --git a/pkg/config/v1alpha3/migrations.go b/pkg/config/v1alpha3/migrations.go index 18af8aa4..b3fffc7e 100644 --- a/pkg/config/v1alpha3/migrations.go +++ b/pkg/config/v1alpha3/migrations.go @@ -25,9 +25,9 @@ package v1alpha3 import ( "encoding/json" - configtypes "github.com/rancher/k3d/v4/pkg/config/types" - "github.com/rancher/k3d/v4/pkg/config/v1alpha2" - l "github.com/rancher/k3d/v4/pkg/logger" + configtypes "github.com/rancher/k3d/v5/pkg/config/types" + "github.com/rancher/k3d/v5/pkg/config/v1alpha2" + l "github.com/rancher/k3d/v5/pkg/logger" ) var Migrations = map[string]func(configtypes.Config) (configtypes.Config, error){ diff --git a/pkg/config/v1alpha3/types.go b/pkg/config/v1alpha3/types.go index c0f160c6..b9543137 100644 --- a/pkg/config/v1alpha3/types.go +++ b/pkg/config/v1alpha3/types.go @@ -28,9 +28,9 @@ import ( "strings" "time" - config "github.com/rancher/k3d/v4/pkg/config/types" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/version" + config "github.com/rancher/k3d/v5/pkg/config/types" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/version" ) const ApiVersion = "k3d.io/v1alpha3" diff --git a/pkg/config/validate.go b/pkg/config/validate.go index bed7fad7..ec6c49c7 100644 --- a/pkg/config/validate.go +++ b/pkg/config/validate.go @@ -26,11 +26,11 @@ import ( "context" "time" - k3dc "github.com/rancher/k3d/v4/pkg/client" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - "github.com/rancher/k3d/v4/pkg/runtimes" - runtimeutil "github.com/rancher/k3d/v4/pkg/runtimes/util" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3dc "github.com/rancher/k3d/v5/pkg/client" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/runtimes" + runtimeutil "github.com/rancher/k3d/v5/pkg/runtimes/util" + k3d "github.com/rancher/k3d/v5/pkg/types" "fmt" diff --git a/pkg/config/validate_test.go b/pkg/config/validate_test.go index 88177808..d6b55c15 100644 --- a/pkg/config/validate_test.go +++ b/pkg/config/validate_test.go @@ -26,8 +26,8 @@ import ( "context" "testing" - conf "github.com/rancher/k3d/v4/pkg/config/v1alpha3" - "github.com/rancher/k3d/v4/pkg/runtimes" + conf "github.com/rancher/k3d/v5/pkg/config/v1alpha3" + "github.com/rancher/k3d/v5/pkg/runtimes" "github.com/spf13/viper" ) diff --git a/pkg/runtimes/docker/container.go b/pkg/runtimes/docker/container.go index 56e515ee..80739a85 100644 --- a/pkg/runtimes/docker/container.go +++ b/pkg/runtimes/docker/container.go @@ -33,8 +33,8 @@ import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/docker.go b/pkg/runtimes/docker/docker.go index f0aa9be9..98add125 100644 --- a/pkg/runtimes/docker/docker.go +++ b/pkg/runtimes/docker/docker.go @@ -26,7 +26,7 @@ import ( "net/url" "os" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) type Docker struct{} diff --git a/pkg/runtimes/docker/info.go b/pkg/runtimes/docker/info.go index e793a5f3..c8eca546 100644 --- a/pkg/runtimes/docker/info.go +++ b/pkg/runtimes/docker/info.go @@ -27,7 +27,7 @@ import ( "fmt" "strings" - runtimeTypes "github.com/rancher/k3d/v4/pkg/runtimes/types" + runtimeTypes "github.com/rancher/k3d/v5/pkg/runtimes/types" ) func (d Docker) Info() (*runtimeTypes.RuntimeInfo, error) { diff --git a/pkg/runtimes/docker/kubeconfig.go b/pkg/runtimes/docker/kubeconfig.go index dc67ea31..46588aa8 100644 --- a/pkg/runtimes/docker/kubeconfig.go +++ b/pkg/runtimes/docker/kubeconfig.go @@ -27,8 +27,8 @@ import ( "fmt" "io" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // GetKubeconfig grabs the kubeconfig from inside a k3d node diff --git a/pkg/runtimes/docker/machine.go b/pkg/runtimes/docker/machine.go index 5ef510d8..0504e844 100644 --- a/pkg/runtimes/docker/machine.go +++ b/pkg/runtimes/docker/machine.go @@ -28,7 +28,7 @@ import ( "os/exec" "strings" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) func (d Docker) GetDockerMachineIP() (string, error) { diff --git a/pkg/runtimes/docker/network.go b/pkg/runtimes/docker/network.go index e364a1d7..7f909889 100644 --- a/pkg/runtimes/docker/network.go +++ b/pkg/runtimes/docker/network.go @@ -32,10 +32,10 @@ import ( "github.com/docker/docker/api/types/network" "inet.af/netaddr" - l "github.com/rancher/k3d/v4/pkg/logger" - runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/util" + l "github.com/rancher/k3d/v5/pkg/logger" + runtimeErr "github.com/rancher/k3d/v5/pkg/runtimes/errors" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/util" ) // GetNetwork returns a given network diff --git a/pkg/runtimes/docker/node.go b/pkg/runtimes/docker/node.go index b2b8f7e4..e0a0e315 100644 --- a/pkg/runtimes/docker/node.go +++ b/pkg/runtimes/docker/node.go @@ -33,9 +33,9 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - l "github.com/rancher/k3d/v4/pkg/logger" - runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + runtimeErr "github.com/rancher/k3d/v5/pkg/runtimes/errors" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // CreateNode creates a new container diff --git a/pkg/runtimes/docker/translate.go b/pkg/runtimes/docker/translate.go index d4bd1481..873c4a06 100644 --- a/pkg/runtimes/docker/translate.go +++ b/pkg/runtimes/docker/translate.go @@ -32,10 +32,10 @@ import ( docker "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/network" "github.com/docker/go-connections/nat" - l "github.com/rancher/k3d/v4/pkg/logger" - runtimeErr "github.com/rancher/k3d/v4/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/fixes" + l "github.com/rancher/k3d/v5/pkg/logger" + runtimeErr "github.com/rancher/k3d/v5/pkg/runtimes/errors" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/fixes" "inet.af/netaddr" dockercliopts "github.com/docker/cli/opts" diff --git a/pkg/runtimes/docker/translate_test.go b/pkg/runtimes/docker/translate_test.go index 873b3a6f..43b66168 100644 --- a/pkg/runtimes/docker/translate_test.go +++ b/pkg/runtimes/docker/translate_test.go @@ -30,8 +30,8 @@ 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/v4/pkg/types" - "github.com/rancher/k3d/v4/pkg/types/fixes" + k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/rancher/k3d/v5/pkg/types/fixes" ) func TestTranslateNodeToContainer(t *testing.T) { diff --git a/pkg/runtimes/docker/util.go b/pkg/runtimes/docker/util.go index d5b41cfa..e5d2a8e9 100644 --- a/pkg/runtimes/docker/util.go +++ b/pkg/runtimes/docker/util.go @@ -37,9 +37,9 @@ import ( "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" "github.com/pkg/errors" - l "github.com/rancher/k3d/v4/pkg/logger" - runtimeErrors "github.com/rancher/k3d/v4/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + runtimeErrors "github.com/rancher/k3d/v5/pkg/runtimes/errors" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // GetDefaultObjectLabelsFilter returns docker type filters created from k3d labels diff --git a/pkg/runtimes/docker/volume.go b/pkg/runtimes/docker/volume.go index 6166bf28..2026dd08 100644 --- a/pkg/runtimes/docker/volume.go +++ b/pkg/runtimes/docker/volume.go @@ -27,8 +27,8 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/volume" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // CreateVolume creates a new named volume diff --git a/pkg/runtimes/runtime.go b/pkg/runtimes/runtime.go index d79cab77..ce52cfb4 100644 --- a/pkg/runtimes/runtime.go +++ b/pkg/runtimes/runtime.go @@ -30,9 +30,9 @@ import ( "os" "time" - "github.com/rancher/k3d/v4/pkg/runtimes/docker" - runtimeTypes "github.com/rancher/k3d/v4/pkg/runtimes/types" - k3d "github.com/rancher/k3d/v4/pkg/types" + "github.com/rancher/k3d/v5/pkg/runtimes/docker" + runtimeTypes "github.com/rancher/k3d/v5/pkg/runtimes/types" + k3d "github.com/rancher/k3d/v5/pkg/types" ) // SelectedRuntime is a runtime (pun intended) variable determining the selected runtime diff --git a/pkg/runtimes/util/volumes.go b/pkg/runtimes/util/volumes.go index 36544920..0262501a 100644 --- a/pkg/runtimes/util/volumes.go +++ b/pkg/runtimes/util/volumes.go @@ -27,9 +27,9 @@ import ( rt "runtime" "strings" - "github.com/rancher/k3d/v4/pkg/runtimes" + "github.com/rancher/k3d/v5/pkg/runtimes" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // ValidateVolumeMount checks, if the source of volume mounts exists and if the destination is an absolute path diff --git a/pkg/types/images.go b/pkg/types/images.go index a4ecba9a..56e4c13f 100644 --- a/pkg/types/images.go +++ b/pkg/types/images.go @@ -25,8 +25,8 @@ import ( "fmt" "os" - l "github.com/rancher/k3d/v4/pkg/logger" - "github.com/rancher/k3d/v4/version" + l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/rancher/k3d/v5/version" ) // DefaultK3sImageRepo specifies the default image repository for the used k3s image diff --git a/pkg/types/types.go b/pkg/types/types.go index d98c9112..1035ad3f 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -28,8 +28,8 @@ import ( "time" "github.com/docker/go-connections/nat" - "github.com/rancher/k3d/v4/pkg/types/k3s" - "github.com/rancher/k3d/v4/version" + "github.com/rancher/k3d/v5/pkg/types/k3s" + "github.com/rancher/k3d/v5/version" "inet.af/netaddr" ) diff --git a/pkg/util/filter.go b/pkg/util/filter.go index 689b0a4a..2998ffa4 100644 --- a/pkg/util/filter.go +++ b/pkg/util/filter.go @@ -27,8 +27,8 @@ import ( "strconv" "strings" - l "github.com/rancher/k3d/v4/pkg/logger" - k3d "github.com/rancher/k3d/v4/pkg/types" + l "github.com/rancher/k3d/v5/pkg/logger" + k3d "github.com/rancher/k3d/v5/pkg/types" ) const ( diff --git a/pkg/util/registry.go b/pkg/util/registry.go index d76056d6..d2ec3c82 100644 --- a/pkg/util/registry.go +++ b/pkg/util/registry.go @@ -26,7 +26,7 @@ import ( "regexp" "github.com/docker/go-connections/nat" - k3d "github.com/rancher/k3d/v4/pkg/types" + k3d "github.com/rancher/k3d/v5/pkg/types" ) var registryRefRegexp = regexp.MustCompile(`^(?Phttp:\/\/|https:\/\/)?(?P(?P\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|(?P[a-zA-Z\-\.0-9]+)){1}?((:)(?P\d{1,5}))?((:)(?P\d{1,5}))?$`) diff --git a/version/version.go b/version/version.go index 13a2090b..78db2ba2 100644 --- a/version/version.go +++ b/version/version.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/heroku/docker-registry-client/registry" - l "github.com/rancher/k3d/v4/pkg/logger" + l "github.com/rancher/k3d/v5/pkg/logger" ) // Version is the string that contains version