From 852df7786ab5a98b9ecd95e1b215d593cf9201d8 Mon Sep 17 00:00:00 2001 From: Thorsten Klein Date: Thu, 17 Feb 2022 14:07:47 +0100 Subject: [PATCH] [Migration] search and replace rancher/k3d with k3d-io/k3d in most places (#976) --- .github/ISSUE_TEMPLATE/question_help.md | 2 +- .github/pull_request_template.md | 6 +- CONTRIBUTING.md | 2 +- Makefile | 4 +- README.md | 62 +++++++++---------- cmd/cluster/cluster.go | 2 +- cmd/cluster/clusterCreate.go | 18 +++--- cmd/cluster/clusterDelete.go | 16 ++--- 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 | 16 ++--- 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 +- docgen/go.mod | 6 +- docgen/main.go | 4 +- docs/design/networking.md | 2 +- docs/design/project.md | 56 ++++++++--------- docs/faq/compatibility.md | 2 +- docs/faq/faq.md | 14 ++--- docs/index.md | 22 +++---- docs/usage/configfile.md | 2 +- go.mod | 2 +- install.sh | 2 +- main.go | 2 +- mkdocs.yml | 4 +- pkg/actions/nodehooks.go | 8 +-- pkg/client/cluster.go | 20 +++--- pkg/client/clusterName.go | 2 +- pkg/client/environment.go | 6 +- pkg/client/fixes.go | 6 +- pkg/client/hooks.go | 6 +- pkg/client/host.go | 10 +-- pkg/client/ipam.go | 6 +- pkg/client/kubeconfig.go | 6 +- pkg/client/loadbalancer.go | 8 +-- pkg/client/node.go | 22 +++---- 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 | 12 ++-- pkg/config/config.versions.meta.schema.json | 2 +- pkg/config/config.versions.schema.json | 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/migrate_test.go | 6 +- pkg/config/process.go | 10 +-- pkg/config/process_test.go | 6 +- pkg/config/transform.go | 18 +++--- pkg/config/transform_test.go | 4 +- pkg/config/v1alpha2/types.go | 6 +- pkg/config/v1alpha3/migrations.go | 10 +-- pkg/config/v1alpha3/types.go | 6 +- pkg/config/v1alpha4/migrations.go | 8 +-- pkg/config/v1alpha4/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 | 8 +-- 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 | 8 +-- pkg/types/defaults.go | 4 +- .../fixes/assets/k3d-entrypoint-cgroupv2.sh | 2 +- pkg/types/fixes/fixes.go | 2 +- pkg/types/images.go | 4 +- pkg/types/k3slogs.go | 2 +- pkg/types/types.go | 4 +- pkg/util/filter.go | 4 +- pkg/util/registry.go | 2 +- tools/Makefile | 4 +- tools/go.mod | 2 +- tools/main.go | 4 +- version/version.go | 2 +- 113 files changed, 428 insertions(+), 428 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/question_help.md b/.github/ISSUE_TEMPLATE/question_help.md index f2755983b..764d570b7 100644 --- a/.github/ISSUE_TEMPLATE/question_help.md +++ b/.github/ISSUE_TEMPLATE/question_help.md @@ -8,7 +8,7 @@ assignees: '' --- diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 248a52f3c..29095f0aa 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,8 +2,8 @@ Hi there, have an early THANK YOU for your contribution! k3d is a community-driven project, so we really highly appreciate any support. Please make sure, you've read our Code of Conduct and the Contributing Guidelines :) -- Code of Conduct: https://github.com/rancher/k3d/blob/main/CODE_OF_CONDUCT.md -- Contributing Guidelines: https://github.com/rancher/k3d/blob/main/CONTRIBUTING.md +- Code of Conduct: https://github.com/k3d-io/k3d/blob/main/CODE_OF_CONDUCT.md +- Contributing Guidelines: https://github.com/k3d-io/k3d/blob/main/CONTRIBUTING.md --> # What @@ -21,4 +21,4 @@ Does this change existing behavior? If so, does it affect the CLI (cmd/) only or Especially mention breaking changes here! --> - + diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index be2377285..8dd096796 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ If you want to show up in our Contributors section, please make use of the @all- Here's a full guide on using the bot: . The simplest way to use it is (in a comment on an issue or a pull-request): `@all-contributors please add for `, where `` is a [list of contributions](https://allcontributors.org/docs/en/emoji-key). -Here's an [example comment on a PR](https://github.com/rancher/k3d/pull/368#issuecomment-704320376) to tell the bot to add @zeerorg (who had the initial idea for k3s in docker) to the list of contributors for the ideas and code he added: +Here's an [example comment on a PR](https://github.com/k3d-io/k3d/pull/368#issuecomment-704320376) to tell the bot to add @zeerorg (who had the initial idea for k3s in docker) to the list of contributors for the ideas and code he added: > @all-contributors please add @zeerorg for ideas and code diff --git a/Makefile b/Makefile index 0edaa91d8..ee26cd578 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ PKG := $(shell go mod vendor) TAGS := TESTS := ./... TESTFLAGS := -LDFLAGS := -w -s -X github.com/rancher/k3d/v5/version.Version=${GIT_TAG} -X github.com/rancher/k3d/v5/version.K3sVersion=${K3S_TAG} +LDFLAGS := -w -s -X github.com/k3d-io/k3d/v5/version.Version=${GIT_TAG} -X github.com/k3d-io/k3d/v5/version.K3sVersion=${K3S_TAG} GCFLAGS := GOFLAGS := -mod vendor BINDIR := $(CURDIR)/bin @@ -78,7 +78,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/v5/version.HelperVersionOverride=${K3D_HELPER_VERSION} +LDFLAGS += -X github.com/k3d-io/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 a22c1b28d..788c4e6af 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # [![k3d](docs/static/img/k3d_logo_black_blue.svg)](https://k3d.io/) [![Build Status](https://img.shields.io/drone/build/rancher/k3d/main?logo=drone&server=https%3A%2F%2Fdrone-publish.rancher.io&style=flat-square)](https://drone-publish.rancher.io/rancher/k3d) -[![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) +[![License](https://img.shields.io/github/license/k3d-io/k3d?style=flat-square)](./LICENSE.md) +![Downloads](https://img.shields.io/github/downloads/k3d-io/k3d/total.svg?style=flat-square) -[![Go Module](https://img.shields.io/badge/Go%20Module-github.com%2Francher%2Fk3d%2Fv5-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) +[![Go Module](https://img.shields.io/badge/Go%20Module-github.com%2Francher%2Fk3d%2Fv5-007d9c?logo=go&logoColor=white&style=flat-square)](https://pkg.go.dev/github.com/k3d-io/k3d/v5) +[![Go version](https://img.shields.io/github/go-mod/go-version/k3d-io/k3d?logo=go&logoColor=white&style=flat-square)](./go.mod) +[![Go Report Card](https://goreportcard.com/badge/github.com/k3d-io/k3d?style=flat-square)](https://goreportcard.com/report/github.com/k3d-io/k3d) [![All Contributors](https://img.shields.io/badge/all_contributors-17-orange.svg?style=flat-square)](#contributors-) @@ -32,7 +32,7 @@ k3d creates containerized k3s clusters. This means, that you can spin up a multi ## Requirements - [docker](https://docs.docker.com/install/) - - Note: k3d v5.x.x requires at least Docker v20.10.5 (runc >= v1.0.0-rc93) to work properly (see [#807](https://github.com/rancher/k3d/issues/807)) + - Note: k3d v5.x.x requires at least Docker v20.10.5 (runc >= v1.0.0-rc93) to work properly (see [#807](https://github.com/k3d-io/k3d/issues/807)) ## Releases @@ -42,8 +42,8 @@ k3d creates containerized k3s clusters. This means, that you can spin up a multi | Platform | Stage | Version | Release Date | Downloads so far | |-----------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|---| -| [**GitHub Releases**](https://github.com/rancher/k3d/releases) | stable | [![GitHub release (latest by date)](https://img.shields.io/github/v/release/rancher/k3d?label=%20&style=for-the-badge&logo=github)](https://github.com/rancher/k3d/releases/latest) | [![GitHub Release Date](https://img.shields.io/github/release-date/rancher/k3d?label=%20&style=for-the-badge)](https://github.com/rancher/k3d/releases/latest) | ![GitHub Release Downloads](https://img.shields.io/github/downloads/rancher/k3d/latest/total?label=%20&style=for-the-badge) | -| [**GitHub Releases**](https://github.com/rancher/k3d/releases) | latest | [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/rancher/k3d?include_prereleases&label=%20&style=for-the-badge&logo=github)](https://github.com/rancher/k3d/releases) | [![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/rancher/k3d?label=%20&style=for-the-badge)](https://github.com/rancher/k3d/releases) | ![GitHub Release Downloads (incl. Pre-Releases)](https://img.shields.io/github/downloads-pre/rancher/k3d/latest/total?label=%20&style=for-the-badge) | +| [**GitHub Releases**](https://github.com/k3d-io/k3d/releases) | stable | [![GitHub release (latest by date)](https://img.shields.io/github/v/release/k3d-io/k3d?label=%20&style=for-the-badge&logo=github)](https://github.com/k3d-io/k3d/releases/latest) | [![GitHub Release Date](https://img.shields.io/github/release-date/k3d-io/k3d?label=%20&style=for-the-badge)](https://github.com/k3d-io/k3d/releases/latest) | ![GitHub Release Downloads](https://img.shields.io/github/downloads/k3d-io/k3d/latest/total?label=%20&style=for-the-badge) | +| [**GitHub Releases**](https://github.com/k3d-io/k3d/releases) | latest | [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/k3d-io/k3d?include_prereleases&label=%20&style=for-the-badge&logo=github)](https://github.com/k3d-io/k3d/releases) | [![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/k3d-io/k3d?label=%20&style=for-the-badge)](https://github.com/k3d-io/k3d/releases) | ![GitHub Release Downloads (incl. Pre-Releases)](https://img.shields.io/github/downloads-pre/k3d-io/k3d/latest/total?label=%20&style=for-the-badge) | | [**Homebrew**](https://formulae.brew.sh/formula/k3d) | stable | [![homebrew](https://img.shields.io/homebrew/v/k3d?label=%20&style=for-the-badge)](https://formulae.brew.sh/formula/k3d) | - | - | | [**Chocolatey**](https://chocolatey.org/packages/k3d/)| stable | [![chocolatey](https://img.shields.io/chocolatey/v/k3d?label=%20&style=for-the-badge)](https://chocolatey.org/packages/k3d/) | - | - | @@ -52,18 +52,18 @@ k3d creates containerized k3s clusters. This means, that you can spin up a multi You have several options there: - use the install script to grab the latest release: - - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` - - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` + - wget: `wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash` + - curl: `curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash` - use the install script to grab a specific release (via `TAG` environment variable): - - wget: `wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v5.0.0 bash` - - curl: `curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v5.0.0 bash` + - wget: `wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.0.0 bash` + - curl: `curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.0.0 bash` - use [Homebrew](https://brew.sh): `brew install k3d` (Homebrew is available for MacOS and Linux) - Formula can be found in [homebrew/homebrew-core](https://github.com/Homebrew/homebrew-core/blob/master/Formula/k3d.rb) and is mirrored to [homebrew/linuxbrew-core](https://github.com/Homebrew/linuxbrew-core/blob/master/Formula/k3d.rb) - install via [MacPorts](https://www.macports.org): `sudo port selfupdate && sudo port install k3d` (MacPorts is available for MacOS) - install via [AUR](https://aur.archlinux.org/) package [rancher-k3d-bin](https://aur.archlinux.org/packages/rancher-k3d-bin/): `yay -S rancher-k3d-bin` -- grab a release from the [release tab](https://github.com/rancher/k3d/releases) and install it yourself. -- install via go: `go install github.com/rancher/k3d@latest` (**Note**: this will give you unreleased/bleeding-edge changes) +- grab a release from the [release tab](https://github.com/k3d-io/k3d/releases) and install it yourself. +- install via go: `go install github.com/k3d-io/k3d@latest` (**Note**: this will give you unreleased/bleeding-edge changes) - use [Chocolatey](https://chocolatey.org/): `choco install k3d` (Chocolatey package manager is available for Windows) - package source can be found in [erwinkersten/chocolatey-packages](https://github.com/erwinkersten/chocolatey-packages/tree/master/automatic/k3d) @@ -71,7 +71,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/v5@main` +1. Clone this repo, e.g. via `git clone git@github.com:k3d-io/k3d.git` or `go get github.com/k3d-io/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 @@ -98,7 +98,7 @@ Example Workflow: Create a new cluster and use it with `kubectl` ## History -This repository is based on [@zeerorg](https://github.com/zeerorg/)'s [zeerorg/k3s-in-docker](https://github.com/zeerorg/k3s-in-docker), reimplemented in Go by [@iwilltry42](https://github.com/iwilltry42/) in [iwilltry42/k3d](https://github.com/iwilltry42/k3d), which got adopted by Rancher in[rancher/k3d](https://github.com/rancher/k3d). +This repository is based on [@zeerorg](https://github.com/zeerorg/)'s [zeerorg/k3s-in-docker](https://github.com/zeerorg/k3s-in-docker), reimplemented in Go by [@iwilltry42](https://github.com/iwilltry42/) in [iwilltry42/k3d](https://github.com/iwilltry42/k3d), which got adopted by Rancher in [rancher/k3d](https://github.com/rancher/k3d) and was now moved into its own GitHub organization at [k3d-io/k3d](https://github.com/k3d-io/k3d). ## Related Projects @@ -127,27 +127,27 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d - - - - - - + + + + + + - - + + - - - - + + + + - - - + + +

Thorsten Klein
💻 📖 🤔 🚧
Rishabh Gupta
🤔 💻
Louis Tournayre
📖
Lionel Nicolas
💻
Toon Sevrin
💻
Dennis Hoppe
📖 💡
Thorsten Klein
💻 📖 🤔 🚧
Rishabh Gupta
🤔 💻
Louis Tournayre
📖
Lionel Nicolas
💻
Toon Sevrin
💻
Dennis Hoppe
📖 💡
Jonas Dellinger
🚇

markrexwinkel
📖
Alvaro
💻 🤔 🔌
markrexwinkel
📖
Alvaro
💻 🤔 🔌
Nuno do Carmo
🖋 ✅ 💬
Erwin Kersten
📖
Alex Sears
📖
Mateusz Urbanek
💻
Benjamin Blattberg
💻
Erwin Kersten
📖
Alex Sears
📖
Mateusz Urbanek
💻
Benjamin Blattberg
💻

Simon Baier
💻
Ambrose Chua
💻
Erik Godding Boye
💻
Simon Baier
💻
Ambrose Chua
💻
Erik Godding Boye
💻
diff --git a/cmd/cluster/cluster.go b/cmd/cluster/cluster.go index ea0d79118..dc7d464d8 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/cluster/clusterCreate.go b/cmd/cluster/clusterCreate.go index 3234aea7a..5eef82b2b 100644 --- a/cmd/cluster/clusterCreate.go +++ b/cmd/cluster/clusterCreate.go @@ -38,15 +38,15 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v2" - 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/v1alpha4" - 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" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" + cliconfig "github.com/k3d-io/k3d/v5/cmd/util/config" + k3dCluster "github.com/k3d-io/k3d/v5/pkg/client" + "github.com/k3d-io/k3d/v5/pkg/config" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/version" ) var configFile string diff --git a/cmd/cluster/clusterDelete.go b/cmd/cluster/clusterDelete.go index ebf4c591a..a653ab960 100644 --- a/cmd/cluster/clusterDelete.go +++ b/cmd/cluster/clusterDelete.go @@ -27,14 +27,14 @@ import ( "os" "path" - "github.com/rancher/k3d/v5/cmd/util" - cliconfig "github.com/rancher/k3d/v5/cmd/util/config" - "github.com/rancher/k3d/v5/pkg/client" - "github.com/rancher/k3d/v5/pkg/config" - 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/k3d-io/k3d/v5/cmd/util" + cliconfig "github.com/k3d-io/k3d/v5/cmd/util/config" + "github.com/k3d-io/k3d/v5/pkg/client" + "github.com/k3d-io/k3d/v5/pkg/config" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + k3dutil "github.com/k3d-io/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 503e84c42..ab9172dd4 100644 --- a/cmd/cluster/clusterEdit.go +++ b/cmd/cluster/clusterEdit.go @@ -22,13 +22,13 @@ THE SOFTWARE. package cluster import ( - "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/v1alpha4" - 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/k3d-io/k3d/v5/cmd/util" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/cluster/clusterList.go b/cmd/cluster/clusterList.go index 66d4a3149..c2f569171 100644 --- a/cmd/cluster/clusterList.go +++ b/cmd/cluster/clusterList.go @@ -28,11 +28,11 @@ import ( "os" "strings" - "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/k3d-io/k3d/v5/cmd/util" + k3cluster "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/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 01a0e29a0..71daea4c9 100644 --- a/cmd/cluster/clusterStart.go +++ b/cmd/cluster/clusterStart.go @@ -24,14 +24,14 @@ package cluster import ( "time" - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" - l "github.com/rancher/k3d/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // NewCmdClusterStart returns a new cobra command diff --git a/cmd/cluster/clusterStop.go b/cmd/cluster/clusterStop.go index a1ab75c01..6627c7c06 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/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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // NewCmdClusterStop returns a new cobra command diff --git a/cmd/config/config.go b/cmd/config/config.go index 6f00f67d8..6e45c255d 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/configInit.go b/cmd/config/configInit.go index 6d72c320d..1153af4a8 100644 --- a/cmd/config/configInit.go +++ b/cmd/config/configInit.go @@ -25,8 +25,8 @@ import ( "fmt" "os" - config "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - l "github.com/rancher/k3d/v5/pkg/logger" + config "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/config/configMigrate.go b/cmd/config/configMigrate.go index 1c80239f5..3726b060b 100644 --- a/cmd/config/configMigrate.go +++ b/cmd/config/configMigrate.go @@ -25,8 +25,8 @@ import ( "os" "strings" - "github.com/rancher/k3d/v5/pkg/config" - l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/config" + l "github.com/k3d-io/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 e3f559971..874eba2c8 100644 --- a/cmd/debug/debug.go +++ b/cmd/debug/debug.go @@ -24,11 +24,11 @@ package debug import ( "fmt" - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/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 d74387c59..220af95cc 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/image/imageImport.go b/cmd/image/imageImport.go index cbdce18a4..7cba06fe5 100644 --- a/cmd/image/imageImport.go +++ b/cmd/image/imageImport.go @@ -26,11 +26,11 @@ import ( "github.com/spf13/cobra" - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // NewCmdImageImport returns a new cobra command @@ -45,16 +45,16 @@ func NewCmdImageImport() *cobra.Command { Long: `Import image(s) from docker into k3d cluster(s). If an IMAGE starts with the prefix 'docker.io/', then this prefix is stripped internally. -That is, 'docker.io/rancher/k3d-tools:latest' is treated as 'rancher/k3d-tools:latest'. +That is, 'docker.io/k3d-io/k3d-tools:latest' is treated as 'k3d-io/k3d-tools:latest'. If an IMAGE starts with the prefix 'library/' (or 'docker.io/library/'), then this prefix is stripped internally. That is, 'library/busybox:latest' (or 'docker.io/library/busybox:latest') are treated as 'busybox:latest'. If an IMAGE does not have a version tag, then ':latest' is assumed. -That is, 'rancher/k3d-tools' is treated as 'rancher/k3d-tools:latest'. +That is, 'k3d-io/k3d-tools' is treated as 'k3d-io/k3d-tools:latest'. A file ARCHIVE always takes precedence. -So if a file './rancher/k3d-tools' exists, k3d will try to import it instead of the IMAGE of the same name.`, +So if a file './k3d-io/k3d-tools' exists, k3d will try to import it instead of the IMAGE of the same name.`, Aliases: []string{"load"}, Args: cobra.MinimumNArgs(1), Run: func(cmd *cobra.Command, args []string) { diff --git a/cmd/kubeconfig/kubeconfig.go b/cmd/kubeconfig/kubeconfig.go index 5de4388cc..fe5cdcfd2 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/kubeconfig/kubeconfigGet.go b/cmd/kubeconfig/kubeconfigGet.go index 18ba382cb..043ac15a5 100644 --- a/cmd/kubeconfig/kubeconfigGet.go +++ b/cmd/kubeconfig/kubeconfigGet.go @@ -25,11 +25,11 @@ import ( "fmt" "os" - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/kubeconfig/kubeconfigMerge.go b/cmd/kubeconfig/kubeconfigMerge.go index dcdd36a03..39c95e948 100644 --- a/cmd/kubeconfig/kubeconfigMerge.go +++ b/cmd/kubeconfig/kubeconfigMerge.go @@ -27,12 +27,12 @@ import ( "path" "strings" - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + k3dutil "github.com/k3d-io/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 76eb12142..4e7a7653b 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeCreate.go b/cmd/node/nodeCreate.go index 251c84eb7..de4fe65db 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/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" + "github.com/k3d-io/k3d/v5/cmd/util" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" + k3dc "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/version" ) // NewCmdNodeCreate returns a new cobra command diff --git a/cmd/node/nodeDelete.go b/cmd/node/nodeDelete.go index 7afbe4b38..070b11d60 100644 --- a/cmd/node/nodeDelete.go +++ b/cmd/node/nodeDelete.go @@ -22,11 +22,11 @@ THE SOFTWARE. package node import ( - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeEdit.go b/cmd/node/nodeEdit.go index 251dbbc98..d956d0b15 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/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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeList.go b/cmd/node/nodeList.go index cabfcbbbf..70157ad23 100644 --- a/cmd/node/nodeList.go +++ b/cmd/node/nodeList.go @@ -25,12 +25,12 @@ import ( "fmt" "strings" + "github.com/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/liggitt/tabwriter" - "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 60443e5ae..7bfb8c9d0 100644 --- a/cmd/node/nodeStart.go +++ b/cmd/node/nodeStart.go @@ -22,10 +22,10 @@ THE SOFTWARE. package node import ( - "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/k3d-io/k3d/v5/cmd/util" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/node/nodeStop.go b/cmd/node/nodeStop.go index 8b603743e..a155c20ac 100644 --- a/cmd/node/nodeStop.go +++ b/cmd/node/nodeStop.go @@ -22,12 +22,12 @@ THE SOFTWARE. package node import ( - "github.com/rancher/k3d/v5/cmd/util" - "github.com/rancher/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/runtimes" "github.com/spf13/cobra" - l "github.com/rancher/k3d/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // NewCmdNodeStop returns a new cobra command diff --git a/cmd/registry/registry.go b/cmd/registry/registry.go index 77e79e391..fbff85607 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/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryCreate.go b/cmd/registry/registryCreate.go index 0f73a15df..47e5fc983 100644 --- a/cmd/registry/registryCreate.go +++ b/cmd/registry/registryCreate.go @@ -24,14 +24,14 @@ package registry import ( "fmt" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/client" + "github.com/k3d-io/k3d/v5/pkg/client" - cliutil "github.com/rancher/k3d/v5/cmd/util" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryDelete.go b/cmd/registry/registryDelete.go index 858458b52..4dd09768d 100644 --- a/cmd/registry/registryDelete.go +++ b/cmd/registry/registryDelete.go @@ -22,11 +22,11 @@ THE SOFTWARE. package registry import ( - "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/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/registry/registryList.go b/cmd/registry/registryList.go index cd795cf36..7a636813c 100644 --- a/cmd/registry/registryList.go +++ b/cmd/registry/registryList.go @@ -25,12 +25,12 @@ import ( "fmt" "strings" + "github.com/k3d-io/k3d/v5/cmd/util" + "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/liggitt/tabwriter" - "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 30dd4a6db..e54f6ee41 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -36,17 +36,17 @@ import ( "github.com/spf13/cobra" "gopkg.in/yaml.v2" - "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/k3d-io/k3d/v5/cmd/cluster" + cfg "github.com/k3d-io/k3d/v5/cmd/config" + "github.com/k3d-io/k3d/v5/cmd/debug" + "github.com/k3d-io/k3d/v5/cmd/image" + "github.com/k3d-io/k3d/v5/cmd/kubeconfig" + "github.com/k3d-io/k3d/v5/cmd/node" + "github.com/k3d-io/k3d/v5/cmd/registry" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/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 218e00064..5385e042d 100644 --- a/cmd/util/completion.go +++ b/cmd/util/completion.go @@ -25,10 +25,10 @@ import ( "context" "strings" - 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" + k3dcluster "github.com/k3d-io/k3d/v5/pkg/client" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/util/config/config.go b/cmd/util/config/config.go index 731077e4f..0b0b2f76c 100644 --- a/cmd/util/config/config.go +++ b/cmd/util/config/config.go @@ -27,8 +27,8 @@ import ( "path/filepath" "strings" - "github.com/rancher/k3d/v5/pkg/config" - l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/config" + l "github.com/k3d-io/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 94ce1efc6..6bbcf8285 100644 --- a/cmd/util/filter.go +++ b/cmd/util/filter.go @@ -25,7 +25,7 @@ import ( "fmt" "strings" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/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 961b9c5af..c2f3ecee7 100644 --- a/cmd/util/listings.go +++ b/cmd/util/listings.go @@ -28,9 +28,9 @@ import ( "sort" "strings" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/liggitt/tabwriter" - 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 9cb7d3223..2d4fb62d5 100644 --- a/cmd/util/plugins.go +++ b/cmd/util/plugins.go @@ -28,7 +28,7 @@ import ( "os/exec" "strings" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/k3d-io/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 d3dafe01a..60ab1ddf8 100644 --- a/cmd/util/ports.go +++ b/cmd/util/ports.go @@ -29,9 +29,9 @@ import ( "strings" "github.com/docker/go-connections/nat" - l "github.com/rancher/k3d/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/util" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/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 5ff04fd8b..49127c9fe 100644 --- a/cmd/util/runtimeLabels.go +++ b/cmd/util/runtimeLabels.go @@ -24,7 +24,7 @@ package util import ( "strings" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) // validateRuntimeLabelKey validates a given label key is not reserved for internal k3d usage diff --git a/docgen/go.mod b/docgen/go.mod index c415f6ce0..fc8d8a29e 100644 --- a/docgen/go.mod +++ b/docgen/go.mod @@ -1,11 +1,11 @@ -module github.com/rancher/k3d/docgen +module github.com/k3d-io/k3d/docgen go 1.16 require ( github.com/google/gofuzz v1.2.0 // indirect - github.com/rancher/k3d/v5 v5.0.0-00010101000000-000000000000 + github.com/k3d-io/k3d/v5 v5.0.0-00010101000000-000000000000 github.com/spf13/cobra v1.2.1 ) -replace github.com/rancher/k3d/v5 => /PATH/TO/YOUR/REPO/DIRECTORY +replace github.com/k3d-io/k3d/v5 => /PATH/TO/YOUR/REPO/DIRECTORY diff --git a/docgen/main.go b/docgen/main.go index 8e98225cd..ba12bdb3e 100644 --- a/docgen/main.go +++ b/docgen/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/rancher/k3d/v5/cmd" - l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/cmd" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/cobra/doc" ) diff --git a/docs/design/networking.md b/docs/design/networking.md index ed1997039..1d5728d80 100644 --- a/docs/design/networking.md +++ b/docs/design/networking.md @@ -1,7 +1,7 @@ # Networking - Related issues: - - [rancher/k3d #220](https://github.com/rancher/k3d/issues/220) + - [k3d-io/k3d #220](https://github.com/k3d-io/k3d/issues/220) ## Introduction diff --git a/docs/design/project.md b/docs/design/project.md index bfd0b3fc5..f3f4b8199 100644 --- a/docs/design/project.md +++ b/docs/design/project.md @@ -6,54 +6,54 @@ On this page we'll try to give an overview of all the moving bits and pieces in ## Directory Overview -- [`.github/`](https://github.com/rancher/k3d/tree/main/.github) +- [`.github/`](https://github.com/k3d-io/k3d/tree/main/.github) - templates for issues and pull requests - GitHub Action workflow definitions -- [`cmd/`](https://github.com/rancher/k3d/tree/main/cmd) +- [`cmd/`](https://github.com/k3d-io/k3d/tree/main/cmd) - everything related to the actual k3d CLI, like the whole command tree, config initialization, argument parsing, etc. -- [`docgen/`](https://github.com/rancher/k3d/tree/main/docgen) - - sub-module used to auto-generate the documentation for the CLI commands, which ends up in [`docs/usage/commands/`](https://github.com/rancher/k3d/tree/main/docs/usage/commands) -- [`docs/`](https://github.com/rancher/k3d/tree/main/docs) +- [`docgen/`](https://github.com/k3d-io/k3d/tree/main/docgen) + - sub-module used to auto-generate the documentation for the CLI commands, which ends up in [`docs/usage/commands/`](https://github.com/k3d-io/k3d/tree/main/docs/usage/commands) +- [`docs/`](https://github.com/k3d-io/k3d/tree/main/docs) - all the resources used to build [k3d.io](https://k3d.io) using mkdocs -- [`pkg/`]() +- [`pkg/`]() - the place where the magic happens.. here you find all the main logic of k3d - - all function calls within [`cmd/`](https://github.com/rancher/k3d/tree/main/cmd) that do non-trivial things are imported from here + - all function calls within [`cmd/`](https://github.com/k3d-io/k3d/tree/main/cmd) that do non-trivial things are imported from here - this (or rather sub-packages) is what other projects would import as a module to work with k3d without using the CLI -- [`proxy/`](https://github.com/rancher/k3d/tree/main/proxy) +- [`proxy/`](https://github.com/k3d-io/k3d/tree/main/proxy) - configuration to build the [`rancher/k3d-proxy`](https://hub.docker.com/r/rancher/k3d-proxy/) container image which is used as a loadbalancer/proxy in front of (almost) every k3d cluster - this is basically just a combination of NGINX with confd and some k3d-specific configuration details -- [`tests/`](https://github.com/rancher/k3d/tree/main/tests) +- [`tests/`](https://github.com/k3d-io/k3d/tree/main/tests) - a set of bash scripts used for end-to-end (E2E) tests of k3d - mostly used for all the functionality of the k3d CLI which cannot be tested using Go unit tests -- [`tools/`](https://github.com/rancher/k3d/tree/main/tools) +- [`tools/`](https://github.com/k3d-io/k3d/tree/main/tools) - sub-module used to build the [`rancher/k3d-tools`](https://hub.docker.com/r/rancher/k3d-tools) container image which supports some k3d functionality like `k3d image import` -- [`vendor/`](https://github.com/rancher/k3d/tree/main/vendor) +- [`vendor/`](https://github.com/k3d-io/k3d/tree/main/vendor) - result of `go mod vendor`, which contains all dependencies of k3d -- [`version/`](https://github.com/rancher/k3d/tree/main/version) +- [`version/`](https://github.com/k3d-io/k3d/tree/main/version) - package used to code k3d/k3s versions into releases - this is where `go build` injects the version tags when building k3d - that's the output you see when issuing `k3d version` ## Packages Overview -- [`pkg/`](https://github.com/rancher/k3d/tree/main/pkg) - - [`actions/`](https://github.com/rancher/k3d/tree/main/pkg/actions) +- [`pkg/`](https://github.com/k3d-io/k3d/tree/main/pkg) + - [`actions/`](https://github.com/k3d-io/k3d/tree/main/pkg/actions) - hook actions describing actions (commands, etc.) that run at specific stages of the node/cluster lifecycle - e.g. writing configuration files to the container filesystem just before the node (container) starts - - [`client/`](https://github.com/rancher/k3d/tree/main/pkg/client) + - [`client/`](https://github.com/k3d-io/k3d/tree/main/pkg/client) - all the top level functionality to work with k3d primitives - create/retrieve/update/delete/start/stop clusters, nodes, registries, etc. managed by k3d - - [`config/`](https://github.com/rancher/k3d/tree/main/pkg/config) + - [`config/`](https://github.com/k3d-io/k3d/tree/main/pkg/config) - everything related to the k3d configuration (files), like `SimpleConfig` and `ClusterConfig` - - [`runtimes/`](https://github.com/rancher/k3d/tree/main/pkg/runtimes) + - [`runtimes/`](https://github.com/k3d-io/k3d/tree/main/pkg/runtimes) - interface and implementations of runtimes that power k3d (currently, that's only Docker) - - functions in [`client/`](https://github.com/rancher/k3d/tree/main/pkg/client) eventually call runtime functions to "materialize" nodes and clusters - - [`tools/`](https://github.com/rancher/k3d/tree/main/pkg/tools) - - functions eventually calling the [`k3d-tools`](https://hub.docker.com/r/rancher/k3d-tools) container (see [`tools/`](https://github.com/rancher/k3d/tree/main/tools) in the repo root) - - [`types/`](https://github.com/rancher/k3d/tree/main/pkg/types) + - functions in [`client/`](https://github.com/k3d-io/k3d/tree/main/pkg/client) eventually call runtime functions to "materialize" nodes and clusters + - [`tools/`](https://github.com/k3d-io/k3d/tree/main/pkg/tools) + - functions eventually calling the [`k3d-tools`](https://hub.docker.com/r/rancher/k3d-tools) container (see [`tools/`](https://github.com/k3d-io/k3d/tree/main/tools) in the repo root) + - [`types/`](https://github.com/k3d-io/k3d/tree/main/pkg/types) - definition of all k3d primitives and many other details and defaults - e.g. contains the definition of a `Node` or a `Cluster` in k3d - - [`util/`](https://github.com/rancher/k3d/tree/main/pkg/util) + - [`util/`](https://github.com/k3d-io/k3d/tree/main/pkg/util) - some helper functions e.g. for string manipulation/generation, regexp or other re-usable usages ## Anatomy of a Cluster @@ -62,7 +62,7 @@ By default, every k3d cluster consists of at least 2 containers (nodes): 1. (optional, but default and strongly recommended) loadbalancer - - image: [`rancher/k3d-proxy`](https://hub.docker.com/r/rancher/k3d-proxy/), built from [`proxy/`](https://github.com/rancher/k3d/tree/main/proxy) + - image: [`rancher/k3d-proxy`](https://hub.docker.com/r/rancher/k3d-proxy/), built from [`proxy/`](https://github.com/k3d-io/k3d/tree/main/proxy) - purpose: proxy and load balance requests from the outside (i.e. most of the times your local host) to the cluster - by default, it e.g. proxies all the traffic for the Kubernetes API to port `6443` (default listening port of K3s) to all the server nodes in the cluster - can be used for multiple port-mappings to one or more nodes in your cluster @@ -89,10 +89,10 @@ By default, every k3d cluster consists of at least 2 containers (nodes): The k3d repository mainly leverages the following two CI systems: - GitHub Actions - - 2 workflows in to push the artifact to AUR (Arch Linux User Repository) - - logs/history can be seen in the Actions tab: + - 2 workflows in to push the artifact to AUR (Arch Linux User Repository) + - logs/history can be seen in the Actions tab: - DroneCI - - a set of pipelines in a single file: + - a set of pipelines in a single file: - static code analysis - build - tests @@ -104,6 +104,6 @@ The k3d repository mainly leverages the following two CI systems: ## Documentation -The website [k3d.io](https://k3d.io) containing all the documentation for k3d is built using [`mkdocs`](https://www.mkdocs.org/), configured via the [`mkdocs.yml`](https://github.com/rancher/k3d/blob/main/mkdocs.yml) config file with all the content residing in the [`docs/`](https://github.com/rancher/k3d/tree/main/docs) directory (Markdown). +The website [k3d.io](https://k3d.io) containing all the documentation for k3d is built using [`mkdocs`](https://www.mkdocs.org/), configured via the [`mkdocs.yml`](https://github.com/k3d-io/k3d/blob/main/mkdocs.yml) config file with all the content residing in the [`docs/`](https://github.com/k3d-io/k3d/tree/main/docs) directory (Markdown). Use `mkdocs serve` in the repository root to build and serve the webpage locally. -Some parts of the documentation are being auto-generated, like [`docs/usage/commands/`](https://github.com/rancher/k3d/tree/main/docs/usage/commands) is auto-generated using Cobra's command docs generation functionality in [`docgen/`](https://github.com/rancher/k3d/tree/main/docgen). +Some parts of the documentation are being auto-generated, like [`docs/usage/commands/`](https://github.com/k3d-io/k3d/tree/main/docs/usage/commands) is auto-generated using Cobra's command docs generation functionality in [`docgen/`](https://github.com/k3d-io/k3d/tree/main/docgen). diff --git a/docs/faq/compatibility.md b/docs/faq/compatibility.md index 146d337ad..90d1017f6 100644 --- a/docs/faq/compatibility.md +++ b/docs/faq/compatibility.md @@ -16,7 +16,7 @@ We test a full cluster lifecycle with different [K3s channels](https://update.k3 **Expected to Fail** with the following versions: -* <= 20.10.4 (due to runc, see ) +* <= 20.10.4 (due to runc, see ) #### K3s diff --git a/docs/faq/faq.md b/docs/faq/faq.md index 7fe1c7263..221207912 100644 --- a/docs/faq/faq.md +++ b/docs/faq/faq.md @@ -2,7 +2,7 @@ ## Issues with BTRFS -- As [@jaredallard](https://github.com/jaredallard) [pointed out](https://github.com/rancher/k3d/pull/48), people running `k3d` on a system with **btrfs**, may need to mount `/dev/mapper` into the nodes for the setup to work. +- As [@jaredallard](https://github.com/jaredallard) [pointed out](https://github.com/k3d-io/k3d/pull/48), people running `k3d` on a system with **btrfs**, may need to mount `/dev/mapper` into the nodes for the setup to work. - This will do: `#!bash k3d cluster create CLUSTER_NAME -v /dev/mapper:/dev/mapper` ## Issues with ZFS @@ -19,9 +19,9 @@ ## Pods evicted due to lack of disk space - Pods go to evicted state after doing X - - Related issues: [#133 - Pods evicted due to `NodeHasDiskPressure`](https://github.com/rancher/k3d/issues/133) (collection of #119 and #130) + - Related issues: [#133 - Pods evicted due to `NodeHasDiskPressure`](https://github.com/k3d-io/k3d/issues/133) (collection of #119 and #130) - Background: somehow docker runs out of space for the k3d node containers, which triggers a hard eviction in the kubelet - - Possible [fix/workaround by @zer0def](https://github.com/rancher/k3d/issues/133#issuecomment-549065666): + - Possible [fix/workaround by @zer0def](https://github.com/k3d-io/k3d/issues/133#issuecomment-549065666): - use a docker storage driver which cleans up properly (e.g. overlay2) - clean up or expand docker root filesystem - change the kubelet's eviction thresholds upon cluster creation: @@ -38,7 +38,7 @@ - What fails: After the restart, you cannot connect to the cluster anymore and `kubectl` will give you a lot of errors - What causes this issue: it's a [known issue with dqlite in `k3s`](https://github.com/rancher/k3s/issues/1391) which doesn't allow the initializing server node to go down - What's the solution: Hopefully, this will be solved by the planned [replacement of dqlite with embedded etcd in k3s](https://github.com/rancher/k3s/pull/1770) -- Related issues: [#262](https://github.com/rancher/k3d/issues/262) +- Related issues: [#262](https://github.com/k3d-io/k3d/issues/262) ## Passing additional arguments/flags to k3s (and on to e.g. the kube-apiserver) @@ -89,7 +89,7 @@ Some can be fixed by passing the `HTTP_PROXY` environment variables to k3d, some - Problem: inside the container, the certificate of the corporate proxy cannot be validated - Possible Solution: Mounting the CA Certificate from your host into the node containers at start time via `k3d cluster create --volume /path/to/your/certs.crt:/etc/ssl/certs/yourcert.crt` -- Issue: [rancher/k3d#535](https://github.com/rancher/k3d/discussions/535#discussioncomment-474982) +- Issue: [k3d-io/k3d#535](https://github.com/k3d-io/k3d/discussions/535#discussioncomment-474982) ## Spurious PID entries in `/proc` after deleting `k3d` cluster with shared mounts @@ -97,7 +97,7 @@ Some can be fixed by passing the `HTTP_PROXY` environment variables to k3d, some - Problem: Due to above, at times you'll see `no space left on device: unknown` when a pod is scheduled to the nodes - If you observe anything of above sort you can check for inaccessible file systems and unmount them by using below command (note: please remove `xargs umount -l` and check for the diff o/p first) - `diff <(df -ha | grep pods | awk '{print $NF}') <(df -h | grep pods | awk '{print $NF}') | awk '{print $2}' | xargs umount -l` -- As per the conversation on [rancher/k3d#594](https://github.com/rancher/k3d/issues/594#issuecomment-837900646) above issue wasn't reported/known earlier and so there are high chances that it's not universal. +- As per the conversation on [k3d-io/k3d#594](https://github.com/k3d-io/k3d/issues/594#issuecomment-837900646) above issue wasn't reported/known earlier and so there are high chances that it's not universal. ## [SOLVED] Nodes fail to start or get stuck in `NotReady` state with log `nf_conntrack_max: permission denied` @@ -129,7 +129,7 @@ This is going to be fixed "upstream" in k3s itself in [rancher/k3s#3337](https:/ - v1.19.11-k3s1 ([rancher/k3s#3343](https://github.com/k3s-io/k3s/pull/3343)) - v1.20.7-k3s1 ([rancher/k3s#3342](https://github.com/k3s-io/k3s/pull/3342)) - v1.21.1-k3s1 ([rancher/k3s#3341](https://github.com/k3s-io/k3s/pull/3341))) -- Issue Reference: [rancher/k3s#607](https://github.com/rancher/k3d/issues/607) +- Issue Reference: [rancher/k3s#607](https://github.com/k3d-io/k3d/issues/607) ## DockerHub Pull Rate Limit diff --git a/docs/index.md b/docs/index.md index 8f466d964..e328a6653 100644 --- a/docs/index.md +++ b/docs/index.md @@ -28,15 +28,15 @@ k3d makes it very easy to create single- and multi-node [k3s](https://github.com ## Requirements - [**docker**](https://docs.docker.com/install/) to be able to use k3d at all - - Note: k3d v5.x.x requires at least Docker v20.10.5 (runc >= v1.0.0-rc93) to work properly (see [#807](https://github.com/rancher/k3d/issues/807)) + - Note: k3d v5.x.x requires at least Docker v20.10.5 (runc >= v1.0.0-rc93) to work properly (see [#807](https://github.com/k3d-io/k3d/issues/807)) - [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl) to interact with the Kubernetes cluster ## Releases | Platform | Stage | Version | Release Date | Downloads so far | |-----------------|--------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|---| -| [**GitHub Releases**](https://github.com/rancher/k3d/releases) | stable | [![GitHub release (latest by date)](https://img.shields.io/github/v/release/rancher/k3d?label=%20&style=for-the-badge&logo=github)](https://github.com/rancher/k3d/releases/latest) | [![GitHub Release Date](https://img.shields.io/github/release-date/rancher/k3d?label=%20&style=for-the-badge)](https://github.com/rancher/k3d/releases/latest) | ![GitHub Release Downloads](https://img.shields.io/github/downloads/rancher/k3d/latest/total?label=%20&style=for-the-badge) | -| [**GitHub Releases**](https://github.com/rancher/k3d/releases) | latest | [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/rancher/k3d?include_prereleases&label=%20&style=for-the-badge&logo=github)](https://github.com/rancher/k3d/releases) | [![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/rancher/k3d?label=%20&style=for-the-badge)](https://github.com/rancher/k3d/releases) | ![GitHub Release Downloads (incl. Pre-Releases)](https://img.shields.io/github/downloads-pre/rancher/k3d/latest/total?label=%20&style=for-the-badge) | +| [**GitHub Releases**](https://github.com/k3d-io/k3d/releases) | stable | [![GitHub release (latest by date)](https://img.shields.io/github/v/release/k3d-io/k3d?label=%20&style=for-the-badge&logo=github)](https://github.com/k3d-io/k3d/releases/latest) | [![GitHub Release Date](https://img.shields.io/github/release-date/k3d-io/k3d?label=%20&style=for-the-badge)](https://github.com/k3d-io/k3d/releases/latest) | ![GitHub Release Downloads](https://img.shields.io/github/downloads/k3d-io/k3d/latest/total?label=%20&style=for-the-badge) | +| [**GitHub Releases**](https://github.com/k3d-io/k3d/releases) | latest | [![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/k3d-io/k3d?include_prereleases&label=%20&style=for-the-badge&logo=github)](https://github.com/k3d-io/k3d/releases) | [![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/k3d-io/k3d?label=%20&style=for-the-badge)](https://github.com/k3d-io/k3d/releases) | ![GitHub Release Downloads (incl. Pre-Releases)](https://img.shields.io/github/downloads-pre/k3d-io/k3d/latest/total?label=%20&style=for-the-badge) | | [**Homebrew**](https://formulae.brew.sh/formula/k3d) | stable | [![homebrew](https://img.shields.io/homebrew/v/k3d?label=%20&style=for-the-badge)](https://formulae.brew.sh/formula/k3d) | - | - | | [**Chocolatey**](https://chocolatey.org/packages/k3d/)| stable | [![chocolatey](https://img.shields.io/chocolatey/v/k3d?label=%20&style=for-the-badge)](https://chocolatey.org/packages/k3d/) | - | - | @@ -44,19 +44,19 @@ k3d makes it very easy to create single- and multi-node [k3s](https://github.com You have several options there: -### [:fontawesome-regular-file-code: Install Script](https://raw.githubusercontent.com/rancher/k3d/main/install.sh) +### [:fontawesome-regular-file-code: Install Script](https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh) #### Install current latest release -- wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` -- curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash` +- wget: `#!bash wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash` +- curl: `#!bash curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash` #### Install specific release Use the install script to grab a specific release (via `TAG` environment variable): -- wget: `#!bash wget -q -O - https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v5.0.0 bash` -- curl: `#!bash curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=v5.0.0 bash` +- wget: `#!bash wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.0.0 bash` +- curl: `#!bash curl -s https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.0.0 bash` ### Other Installers @@ -70,9 +70,9 @@ Use the install script to grab a specific release (via `TAG` environment variabl Package [rancher-k3d-bin](https://aur.archlinux.org/packages/rancher-k3d-bin/) - - [:material-github: Download GitHub Release](https://github.com/rancher/k3d/releases) + - [:material-github: Download GitHub Release](https://github.com/k3d-io/k3d/releases) - Grab a release binary from the [release tab](https://github.com/rancher/k3d/releases) and install it yourself + Grab a release binary from the [release tab](https://github.com/k3d-io/k3d/releases) and install it yourself - [:material-microsoft-windows: Chocolatey (Windows)](https://chocolatey.org/): `choco install k3d` @@ -85,7 +85,7 @@ Use the install script to grab a specific release (via `TAG` environment variabl *Note*: `asdf plugin-add k3d`, then `asdf install k3d ` with ` = latest` or `5.x.x` for a specific version (maintained by [spencergilbert/asdf-k3d](https://github.com/spencergilbert/asdf-k3d)) - Others - - install via go: `#!bash go install github.com/rancher/k3d@latest` (**Note**: this will give you unreleased/bleeding-edge changes) + - install via go: `#!bash go install github.com/k3d-io/k3d@latest` (**Note**: this will give you unreleased/bleeding-edge changes) ## Quick Start diff --git a/docs/usage/configfile.md b/docs/usage/configfile.md index c9b595686..ac1fb8376 100644 --- a/docs/usage/configfile.md +++ b/docs/usage/configfile.md @@ -42,7 +42,7 @@ Currently, the config file is still in an Alpha-State, meaning, that it is subje !!! info "Validation via JSON-Schema" k3d uses a [JSON-Schema](https://json-schema.org/) to describe the expected format and fields of the configuration file. This schema is also used to [validate](https://github.com/xeipuuv/gojsonschema#validation) a user-given config file. - This JSON-Schema can be found in the specific config version sub-directory in the repository (e.g. [here for `v1alpha4`](https://github.com/rancher/k3d/blob/main/pkg/config/v1alpha4/schema.json)) and could be used to lookup supported fields or by linters to validate the config file, e.g. in your code editor. + This JSON-Schema can be found in the specific config version sub-directory in the repository (e.g. [here for `v1alpha4`](https://github.com/k3d-io/k3d/blob/main/pkg/config/v1alpha4/schema.json)) and could be used to lookup supported fields or by linters to validate the config file, e.g. in your code editor. ### All Options: Example diff --git a/go.mod b/go.mod index b2dbfe85c..b7bc9ccf6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/k3d/v5 +module github.com/k3d-io/k3d/v5 go 1.17 diff --git a/install.sh b/install.sh index 8bfec8d6e..b3edb6c61 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash APP_NAME="k3d" -REPO_URL="https://github.com/rancher/k3d" +REPO_URL="https://github.com/k3d-io/k3d" : ${USE_SUDO:="true"} : ${K3D_INSTALL_DIR:="/usr/local/bin"} diff --git a/main.go b/main.go index b8eb03198..cabbc160e 100644 --- a/main.go +++ b/main.go @@ -21,7 +21,7 @@ THE SOFTWARE. */ package main -import "github.com/rancher/k3d/v5/cmd" +import "github.com/k3d-io/k3d/v5/cmd" func main() { cmd.Execute() diff --git a/mkdocs.yml b/mkdocs.yml index fe57dc40f..becb078e4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -14,8 +14,8 @@ extra_css: - static/css/extra.css # Repo Information -repo_name: rancher/k3d -repo_url: https://github.com/rancher/k3d +repo_name: k3d-io/k3d +repo_url: https://github.com/k3d-io/k3d # Edit Link on Site edit_uri: edit/main/docs/ diff --git a/pkg/actions/nodehooks.go b/pkg/actions/nodehooks.go index 8f1552f79..710f49ee9 100644 --- a/pkg/actions/nodehooks.go +++ b/pkg/actions/nodehooks.go @@ -29,11 +29,11 @@ import ( "os" "strings" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/util" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/util" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) // WriteFileAction writes a file inside into the node filesystem diff --git a/pkg/client/cluster.go b/pkg/client/cluster.go index a50380db7..9d22d5466 100644 --- a/pkg/client/cluster.go +++ b/pkg/client/cluster.go @@ -34,17 +34,17 @@ import ( "github.com/docker/go-connections/nat" "github.com/imdario/mergo" + "github.com/k3d-io/k3d/v5/pkg/actions" + config "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3drt "github.com/k3d-io/k3d/v5/pkg/runtimes" + runtimeErr "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + "github.com/k3d-io/k3d/v5/pkg/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/pkg/util" copystruct "github.com/mitchellh/copystructure" - "github.com/rancher/k3d/v5/pkg/actions" - config "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3drt "github.com/rancher/k3d/v5/pkg/runtimes" - 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 168970511..edb58a243 100644 --- a/pkg/client/clusterName.go +++ b/pkg/client/clusterName.go @@ -25,7 +25,7 @@ import ( "fmt" "regexp" - "github.com/rancher/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types" ) // HostnameRegexp as per RFC 1123 diff --git a/pkg/client/environment.go b/pkg/client/environment.go index e5d0aac72..52c9a9c4c 100644 --- a/pkg/client/environment.go +++ b/pkg/client/environment.go @@ -25,10 +25,10 @@ import ( "context" "fmt" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/k3d-io/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 d0095ef22..dc41d4322 100644 --- a/pkg/client/fixes.go +++ b/pkg/client/fixes.go @@ -25,9 +25,9 @@ import ( "os" "strconv" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" - "github.com/rancher/k3d/v5/pkg/types/fixes" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/types/fixes" ) // FIXME: FixCgroupV2 - to be removed when fixed upstream diff --git a/pkg/client/hooks.go b/pkg/client/hooks.go index 0a0dd253d..ebe7be6a5 100644 --- a/pkg/client/hooks.go +++ b/pkg/client/hooks.go @@ -27,9 +27,9 @@ import ( "time" "github.com/goodhosts/hostsfile" - "github.com/rancher/k3d/v5/pkg/actions" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/actions" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) func NewHostAliasesInjectEtcHostsAction(runtime runtimes.Runtime, hostAliases []k3d.HostAlias) actions.RewriteFileAction { diff --git a/pkg/client/host.go b/pkg/client/host.go index b121bf07a..3d381c81f 100644 --- a/pkg/client/host.go +++ b/pkg/client/host.go @@ -29,11 +29,11 @@ import ( "regexp" goruntime "runtime" - 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/util" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/runtimes/docker" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/util" ) type ResolveHostCmd struct { diff --git a/pkg/client/ipam.go b/pkg/client/ipam.go index 593d548a2..dea07e101 100644 --- a/pkg/client/ipam.go +++ b/pkg/client/ipam.go @@ -25,9 +25,9 @@ import ( "context" "fmt" - l "github.com/rancher/k3d/v5/pkg/logger" - k3drt "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3drt "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "inet.af/netaddr" ) diff --git a/pkg/client/kubeconfig.go b/pkg/client/kubeconfig.go index 946536a8b..e64e611c6 100644 --- a/pkg/client/kubeconfig.go +++ b/pkg/client/kubeconfig.go @@ -30,9 +30,9 @@ import ( "path/filepath" "time" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/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 0d00a9568..64a09caaa 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/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" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/types" + k3d "github.com/k3d-io/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 1c992e15b..be17e0893 100644 --- a/pkg/client/node.go +++ b/pkg/client/node.go @@ -40,17 +40,17 @@ import ( "github.com/docker/go-connections/nat" dockerunits "github.com/docker/go-units" "github.com/imdario/mergo" - "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" - runtimeTypes "github.com/rancher/k3d/v5/pkg/runtimes/types" - - 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/types/k3s" - "github.com/rancher/k3d/v5/pkg/util" + "github.com/k3d-io/k3d/v5/pkg/actions" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/runtimes/docker" + runtimeTypes "github.com/k3d-io/k3d/v5/pkg/runtimes/types" + + runtimeErrors "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types/fixes" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/pkg/util" "golang.org/x/sync/errgroup" ) diff --git a/pkg/client/ports.go b/pkg/client/ports.go index b9f3e36bc..7181af3b4 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/v5/pkg/config/types" - config "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - 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/k3d-io/k3d/v5/pkg/config/types" + config "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/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 f732348c6..ca69f9e5b 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/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" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/runtimes/docker" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/pkg/types/k8s" "gopkg.in/yaml.v2" ) diff --git a/pkg/client/registry_test.go b/pkg/client/registry_test.go index c6fe76827..56f23d862 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/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) func TestRegistryGenerateLocalRegistryHostingConfigMapYAML(t *testing.T) { diff --git a/pkg/client/tools.go b/pkg/client/tools.go index 777ed38ae..c4cb00573 100644 --- a/pkg/client/tools.go +++ b/pkg/client/tools.go @@ -34,9 +34,9 @@ import ( "golang.org/x/sync/errgroup" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/pkg/runtimes" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/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 797f99cd6..845ac02a0 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -25,16 +25,16 @@ import ( "fmt" "strings" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/viper" - "github.com/rancher/k3d/v5/pkg/config/v1alpha2" - "github.com/rancher/k3d/v5/pkg/config/v1alpha3" - "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - defaultConfig "github.com/rancher/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha2" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha3" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + defaultConfig "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" - types "github.com/rancher/k3d/v5/pkg/config/types" + types "github.com/k3d-io/k3d/v5/pkg/config/types" ) const DefaultConfigApiVersion = defaultConfig.ApiVersion diff --git a/pkg/config/config.versions.meta.schema.json b/pkg/config/config.versions.meta.schema.json index 118288d74..a8d94512d 100644 --- a/pkg/config/config.versions.meta.schema.json +++ b/pkg/config/config.versions.meta.schema.json @@ -1,5 +1,5 @@ { - "$id": "https://github.com/rancher/k3d/tree/main/pkg/config/config.versions.meta.schema.json", + "$id": "https://github.com/k3d-io/k3d/tree/main/pkg/config/config.versions.meta.schema.json", "$schema": "http://json-schema.org/draft-07/schema#", "title": "The meta schema for k3d's config version schemas.", "type": "object", diff --git a/pkg/config/config.versions.schema.json b/pkg/config/config.versions.schema.json index f1f481041..eab9a7cf8 100644 --- a/pkg/config/config.versions.schema.json +++ b/pkg/config/config.versions.schema.json @@ -1,6 +1,6 @@ { - "$id": "https://github.com/rancher/k3d/tree/main/pkg/config/config.versions.schema.json", - "$schema": "https://raw.githubusercontent.com/rancher/k3d/main/pkg/config/config.versions.meta.schema.json#", + "$id": "https://github.com/k3d-io/k3d/tree/main/pkg/config/config.versions.schema.json", + "$schema": "https://raw.githubusercontent.com/k3d-io/k3d/main/pkg/config/config.versions.meta.schema.json#", "title": "All k3d config versions", "type": "object", "oneOf": [ @@ -14,7 +14,7 @@ } }, { - "$ref": "https://raw.githubusercontent.com/rancher/k3d/main/pkg/config/v1alpha4/schema.json" + "$ref": "https://raw.githubusercontent.com/k3d-io/k3d/main/pkg/config/v1alpha4/schema.json" } ] },{ @@ -27,7 +27,7 @@ } }, { - "$ref": "https://raw.githubusercontent.com/rancher/k3d/main/pkg/config/v1alpha3/schema.json" + "$ref": "https://raw.githubusercontent.com/k3d-io/k3d/main/pkg/config/v1alpha3/schema.json" } ] }, @@ -41,7 +41,7 @@ } }, { - "$ref": "https://raw.githubusercontent.com/rancher/k3d/main/pkg/config/v1alpha2/schema.json" + "$ref": "https://raw.githubusercontent.com/k3d-io/k3d/main/pkg/config/v1alpha2/schema.json" } ] } diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go index c1971b10a..bd4a528f0 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/v5/pkg/config/types" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" + configtypes "github.com/k3d-io/k3d/v5/pkg/config/types" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" "github.com/spf13/viper" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) func TestReadSimpleConfig(t *testing.T) { diff --git a/pkg/config/jsonschema.go b/pkg/config/jsonschema.go index ffbd7c900..ed746ba55 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/v5/pkg/logger" + l "github.com/k3d-io/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 d1fa86941..0bbca7b11 100644 --- a/pkg/config/jsonschema_test.go +++ b/pkg/config/jsonschema_test.go @@ -24,7 +24,7 @@ package config import ( "testing" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" ) func TestValidateSchema(t *testing.T) { diff --git a/pkg/config/merge.go b/pkg/config/merge.go index 13e070b53..9eefab62d 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/v5/pkg/config/v1alpha4" - l "github.com/rancher/k3d/v5/pkg/logger" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/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 b1007a3da..0a39db63a 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/v5/pkg/config/types" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" + configtypes "github.com/k3d-io/k3d/v5/pkg/config/types" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" "github.com/spf13/viper" "gotest.tools/assert" ) diff --git a/pkg/config/migrate.go b/pkg/config/migrate.go index b2843061c..8c213fefb 100644 --- a/pkg/config/migrate.go +++ b/pkg/config/migrate.go @@ -25,7 +25,7 @@ package config import ( "fmt" - types "github.com/rancher/k3d/v5/pkg/config/types" + types "github.com/k3d-io/k3d/v5/pkg/config/types" ) func Migrate(config types.Config, targetVersion string) (types.Config, error) { diff --git a/pkg/config/migrate_test.go b/pkg/config/migrate_test.go index 7f893b215..b886c8162 100644 --- a/pkg/config/migrate_test.go +++ b/pkg/config/migrate_test.go @@ -26,9 +26,9 @@ import ( "testing" "github.com/go-test/deep" - "github.com/rancher/k3d/v5/pkg/config/v1alpha3" - "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - l "github.com/rancher/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha3" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" "github.com/spf13/viper" ) diff --git a/pkg/config/process.go b/pkg/config/process.go index 264ca8c1f..8103bcc84 100644 --- a/pkg/config/process.go +++ b/pkg/config/process.go @@ -25,11 +25,11 @@ package config import ( "strings" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - l "github.com/rancher/k3d/v5/pkg/logger" - runtimeutil "github.com/rancher/k3d/v5/pkg/runtimes/util" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/types/k3s" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + l "github.com/k3d-io/k3d/v5/pkg/logger" + runtimeutil "github.com/k3d-io/k3d/v5/pkg/runtimes/util" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" ) // ProcessSimpleConfig applies processing to the simple config, sanitizing it and doing some modifications diff --git a/pkg/config/process_test.go b/pkg/config/process_test.go index 5f301a84e..4646936aa 100644 --- a/pkg/config/process_test.go +++ b/pkg/config/process_test.go @@ -27,9 +27,9 @@ import ( "strings" "testing" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - "github.com/rancher/k3d/v5/pkg/runtimes" - "github.com/rancher/k3d/v5/pkg/types/k3s" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" "github.com/spf13/viper" "gotest.tools/assert" ) diff --git a/pkg/config/transform.go b/pkg/config/transform.go index 1a0bb3242..994d47570 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/v5/cmd/util" // TODO: move parseapiport to pkg - "github.com/rancher/k3d/v5/pkg/client" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - "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" + cliutil "github.com/k3d-io/k3d/v5/cmd/util" // TODO: move parseapiport to pkg + "github.com/k3d-io/k3d/v5/pkg/client" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/pkg/util" + "github.com/k3d-io/k3d/v5/version" "gopkg.in/yaml.v2" "inet.af/netaddr" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) // TransformSimpleToClusterConfig transforms a simple configuration to a full-fledged cluster configuration diff --git a/pkg/config/transform_test.go b/pkg/config/transform_test.go index ec315c3cd..c7dd2dc97 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/v5/pkg/config/v1alpha4" - "github.com/rancher/k3d/v5/pkg/runtimes" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/runtimes" "github.com/spf13/viper" ) diff --git a/pkg/config/v1alpha2/types.go b/pkg/config/v1alpha2/types.go index 1b956879e..47b105f77 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/v5/pkg/config/types" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/version" + configtypes "github.com/k3d-io/k3d/v5/pkg/config/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/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 a8d25fdb8..82fe60911 100644 --- a/pkg/config/v1alpha3/migrations.go +++ b/pkg/config/v1alpha3/migrations.go @@ -27,11 +27,11 @@ import ( "fmt" "strings" - 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" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/util" + configtypes "github.com/k3d-io/k3d/v5/pkg/config/types" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha2" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/util" ) 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 9790fba80..728cd9cda 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/v5/pkg/config/types" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/version" + config "github.com/k3d-io/k3d/v5/pkg/config/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/version" ) const ApiVersion = "k3d.io/v1alpha3" diff --git a/pkg/config/v1alpha4/migrations.go b/pkg/config/v1alpha4/migrations.go index c5e8e2c90..6b2022852 100644 --- a/pkg/config/v1alpha4/migrations.go +++ b/pkg/config/v1alpha4/migrations.go @@ -26,10 +26,10 @@ import ( "encoding/json" "fmt" - configtypes "github.com/rancher/k3d/v5/pkg/config/types" - "github.com/rancher/k3d/v5/pkg/config/v1alpha2" - "github.com/rancher/k3d/v5/pkg/config/v1alpha3" - l "github.com/rancher/k3d/v5/pkg/logger" + configtypes "github.com/k3d-io/k3d/v5/pkg/config/types" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha2" + "github.com/k3d-io/k3d/v5/pkg/config/v1alpha3" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) var Migrations = map[string]func(configtypes.Config) (configtypes.Config, error){ diff --git a/pkg/config/v1alpha4/types.go b/pkg/config/v1alpha4/types.go index e4bdee25c..378275a77 100644 --- a/pkg/config/v1alpha4/types.go +++ b/pkg/config/v1alpha4/types.go @@ -28,9 +28,9 @@ import ( "strings" "time" - config "github.com/rancher/k3d/v5/pkg/config/types" - k3d "github.com/rancher/k3d/v5/pkg/types" - "github.com/rancher/k3d/v5/version" + config "github.com/k3d-io/k3d/v5/pkg/config/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/version" ) const ApiVersion = "k3d.io/v1alpha4" diff --git a/pkg/config/validate.go b/pkg/config/validate.go index 1eb03b1ec..8e3c58189 100644 --- a/pkg/config/validate.go +++ b/pkg/config/validate.go @@ -26,11 +26,11 @@ import ( "context" "time" - k3dc "github.com/rancher/k3d/v5/pkg/client" - conf "github.com/rancher/k3d/v5/pkg/config/v1alpha4" - "github.com/rancher/k3d/v5/pkg/runtimes" - runtimeutil "github.com/rancher/k3d/v5/pkg/runtimes/util" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3dc "github.com/k3d-io/k3d/v5/pkg/client" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + runtimeutil "github.com/k3d-io/k3d/v5/pkg/runtimes/util" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "inet.af/netaddr" "fmt" diff --git a/pkg/config/validate_test.go b/pkg/config/validate_test.go index 32d5317e9..d61164258 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/v5/pkg/config/v1alpha4" - "github.com/rancher/k3d/v5/pkg/runtimes" + conf "github.com/k3d-io/k3d/v5/pkg/config/v1alpha4" + "github.com/k3d-io/k3d/v5/pkg/runtimes" "github.com/spf13/viper" ) diff --git a/pkg/runtimes/docker/container.go b/pkg/runtimes/docker/container.go index 2dfdf8bbb..687b1643c 100644 --- a/pkg/runtimes/docker/container.go +++ b/pkg/runtimes/docker/container.go @@ -32,8 +32,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/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/runtimes/docker/docker.go b/pkg/runtimes/docker/docker.go index 16dff3b41..b4b7ff370 100644 --- a/pkg/runtimes/docker/docker.go +++ b/pkg/runtimes/docker/docker.go @@ -27,7 +27,7 @@ import ( "net/url" "os" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) type Docker struct{} diff --git a/pkg/runtimes/docker/info.go b/pkg/runtimes/docker/info.go index 7e29218fc..ea43ac32e 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/v5/pkg/runtimes/types" + runtimeTypes "github.com/k3d-io/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 44e10e11d..d0eb436a3 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/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/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 19a406cff..ea421b45c 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/v5/pkg/logger" + l "github.com/k3d-io/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 a09109bfd..ce55ffb55 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/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" + l "github.com/k3d-io/k3d/v5/pkg/logger" + runtimeErr "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/util" ) // GetNetwork returns a given network diff --git a/pkg/runtimes/docker/node.go b/pkg/runtimes/docker/node.go index e9e6e4387..5ea6d05d2 100644 --- a/pkg/runtimes/docker/node.go +++ b/pkg/runtimes/docker/node.go @@ -33,11 +33,11 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" - l "github.com/rancher/k3d/v5/pkg/logger" - runtimeErr "github.com/rancher/k3d/v5/pkg/runtimes/errors" - runtimeTypes "github.com/rancher/k3d/v5/pkg/runtimes/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + runtimeErr "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + runtimeTypes "github.com/k3d-io/k3d/v5/pkg/runtimes/types" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // CreateNode creates a new container diff --git a/pkg/runtimes/docker/translate.go b/pkg/runtimes/docker/translate.go index c85c5cc67..14135d6c9 100644 --- a/pkg/runtimes/docker/translate.go +++ b/pkg/runtimes/docker/translate.go @@ -34,10 +34,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/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" + l "github.com/k3d-io/k3d/v5/pkg/logger" + runtimeErr "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/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 5d2524b18..0a59aa38c 100644 --- a/pkg/runtimes/docker/translate_test.go +++ b/pkg/runtimes/docker/translate_test.go @@ -32,8 +32,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/v5/pkg/types" - "github.com/rancher/k3d/v5/pkg/types/fixes" + k3d "github.com/k3d-io/k3d/v5/pkg/types" + "github.com/k3d-io/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 b436df5c8..fdd8a3da2 100644 --- a/pkg/runtimes/docker/util.go +++ b/pkg/runtimes/docker/util.go @@ -37,10 +37,10 @@ import ( "github.com/docker/docker/api/types/filters" "github.com/docker/docker/client" "github.com/docker/docker/pkg/archive" + l "github.com/k3d-io/k3d/v5/pkg/logger" + runtimeErrors "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" "github.com/pkg/errors" - 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" "github.com/spf13/pflag" ) diff --git a/pkg/runtimes/docker/volume.go b/pkg/runtimes/docker/volume.go index 10dee8561..3f859e794 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" - runtimeErrors "github.com/rancher/k3d/v5/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v5/pkg/types" + runtimeErrors "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) // CreateVolume creates a new named volume diff --git a/pkg/runtimes/runtime.go b/pkg/runtimes/runtime.go index f208e2908..5015e5ee2 100644 --- a/pkg/runtimes/runtime.go +++ b/pkg/runtimes/runtime.go @@ -30,9 +30,9 @@ import ( "os" "time" - "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" + "github.com/k3d-io/k3d/v5/pkg/runtimes/docker" + runtimeTypes "github.com/k3d-io/k3d/v5/pkg/runtimes/types" + k3d "github.com/k3d-io/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 97d65fcdb..f7f41c69e 100644 --- a/pkg/runtimes/util/volumes.go +++ b/pkg/runtimes/util/volumes.go @@ -29,11 +29,11 @@ import ( rt "runtime" "strings" - "github.com/rancher/k3d/v5/pkg/runtimes" - runtimeErrors "github.com/rancher/k3d/v5/pkg/runtimes/errors" - k3d "github.com/rancher/k3d/v5/pkg/types" + "github.com/k3d-io/k3d/v5/pkg/runtimes" + runtimeErrors "github.com/k3d-io/k3d/v5/pkg/runtimes/errors" + k3d "github.com/k3d-io/k3d/v5/pkg/types" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/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/defaults.go b/pkg/types/defaults.go index 284c78675..4e992b747 100644 --- a/pkg/types/defaults.go +++ b/pkg/types/defaults.go @@ -24,8 +24,8 @@ package types import ( "fmt" - "github.com/rancher/k3d/v5/pkg/types/k3s" - "github.com/rancher/k3d/v5/version" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/version" ) // DefaultClusterName specifies the default name used for newly created clusters diff --git a/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh b/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh index d79814996..e6a0790d0 100755 --- a/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh +++ b/pkg/types/fixes/assets/k3d-entrypoint-cgroupv2.sh @@ -6,7 +6,7 @@ set -o nounset ######################################################################################################################################### # DISCLAIMER # # Copied from https://github.com/moby/moby/blob/ed89041433a031cafc0a0f19cfe573c31688d377/hack/dind#L28-L37 # -# Permission granted by Akihiro Suda (https://github.com/rancher/k3d/issues/493#issuecomment-827405962) # +# Permission granted by Akihiro Suda (https://github.com/k3d-io/k3d/issues/493#issuecomment-827405962) # # Moby License Apache 2.0: https://github.com/moby/moby/blob/ed89041433a031cafc0a0f19cfe573c31688d377/LICENSE # ######################################################################################################################################### if [ -f /sys/fs/cgroup/cgroup.controllers ]; then diff --git a/pkg/types/fixes/fixes.go b/pkg/types/fixes/fixes.go index 35b780cd1..032155fba 100644 --- a/pkg/types/fixes/fixes.go +++ b/pkg/types/fixes/fixes.go @@ -26,7 +26,7 @@ import ( "os" "strconv" - k3d "github.com/rancher/k3d/v5/pkg/types" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) /* NOTE diff --git a/pkg/types/images.go b/pkg/types/images.go index 19befe2e5..f4faa8b46 100644 --- a/pkg/types/images.go +++ b/pkg/types/images.go @@ -26,8 +26,8 @@ import ( "os" "strings" - l "github.com/rancher/k3d/v5/pkg/logger" - "github.com/rancher/k3d/v5/version" + l "github.com/k3d-io/k3d/v5/pkg/logger" + "github.com/k3d-io/k3d/v5/version" ) // DefaultK3sImageRepo specifies the default image repository for the used k3s image diff --git a/pkg/types/k3slogs.go b/pkg/types/k3slogs.go index d6c6dcc05..0cd1d81ba 100644 --- a/pkg/types/k3slogs.go +++ b/pkg/types/k3slogs.go @@ -24,7 +24,7 @@ package types import ( "time" - l "github.com/rancher/k3d/v5/pkg/logger" + l "github.com/k3d-io/k3d/v5/pkg/logger" ) // NodeWaitForLogMessageRestartWarnTime is the time after which to warn about a restarting container diff --git a/pkg/types/types.go b/pkg/types/types.go index 077082fd8..057a098d5 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -27,8 +27,8 @@ import ( "time" "github.com/docker/go-connections/nat" - runtimeTypes "github.com/rancher/k3d/v5/pkg/runtimes/types" - "github.com/rancher/k3d/v5/pkg/types/k3s" + runtimeTypes "github.com/k3d-io/k3d/v5/pkg/runtimes/types" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" "inet.af/netaddr" ) diff --git a/pkg/util/filter.go b/pkg/util/filter.go index d2ad8a521..08749fcda 100644 --- a/pkg/util/filter.go +++ b/pkg/util/filter.go @@ -27,8 +27,8 @@ import ( "strconv" "strings" - l "github.com/rancher/k3d/v5/pkg/logger" - k3d "github.com/rancher/k3d/v5/pkg/types" + l "github.com/k3d-io/k3d/v5/pkg/logger" + k3d "github.com/k3d-io/k3d/v5/pkg/types" ) const ( diff --git a/pkg/util/registry.go b/pkg/util/registry.go index 711175d5f..f84423f49 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/v5/pkg/types" + k3d "github.com/k3d-io/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/tools/Makefile b/tools/Makefile index 01a28c24a..c7472d7bb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -12,7 +12,7 @@ PKG := $(shell go mod vendor) TAGS := TESTS := . TESTFLAGS := -LDFLAGS := -w -s -X github.com/rancher/k3d/tools/version.Version=${GIT_TAG} +LDFLAGS := -w -s -X github.com/k3d-io/k3d/tools/version.Version=${GIT_TAG} GOFLAGS := BINDIR := $(CURDIR)/bin BINARIES := k3d-tools @@ -74,4 +74,4 @@ ifndef HAS_GOX endif ifndef HAS_GOLANGCI (export GO111MODULE=off; go get -u $(PKG_GOLANGCI_LINT)) -endif \ No newline at end of file +endif diff --git a/tools/go.mod b/tools/go.mod index d591f4d4d..a766a41a6 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,4 +1,4 @@ -module github.com/rancher/k3d/tools +module github.com/k3d-io/k3d/tools go 1.17 diff --git a/tools/main.go b/tools/main.go index d732acc89..d70342984 100644 --- a/tools/main.go +++ b/tools/main.go @@ -7,8 +7,8 @@ import ( log "github.com/sirupsen/logrus" - run "github.com/rancher/k3d/tools/cmd" - "github.com/rancher/k3d/tools/version" + run "github.com/k3d-io/k3d/tools/cmd" + "github.com/k3d-io/k3d/tools/version" "github.com/urfave/cli" ) diff --git a/version/version.go b/version/version.go index c55dec1fa..1ef142f3d 100644 --- a/version/version.go +++ b/version/version.go @@ -28,7 +28,7 @@ import ( "net/http" "strings" - "github.com/rancher/k3d/v5/pkg/types/k3s" + "github.com/k3d-io/k3d/v5/pkg/types/k3s" ) // Version is the string that contains version