[master] changing package to k3s-io (#4846)

* changing package to k3s-io

Signed-off-by: Luther Monson <luther.monson@gmail.com>

Co-authored-by: Derek Nola <derek.nola@suse.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 <!-- HTML Comments can be left in place or removed. -->
-<!-- Please see our contributing guide at https://github.com/rancher/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests -->
+<!-- Please see our contributing guide at https://github.com/k3s-io/k3s/blob/master/CONTRIBUTING.md for guidance on opening pull requests -->
 
 #### Proposed Changes ####
 
@@ -15,7 +15,7 @@
 
 #### Linked Issues ####
 
-<!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/rancher/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
+<!-- Link any related issues, pull-requests, or commit hashes that are relevant to this pull request. If you are opening a PR without a corresponding issue please consider creating one first, at https://github.com/k3s-io/k3s/issues . A functional example will greatly help QA with verifying/reproducing a bug or testing new features. -->
 
 #### User-Facing Change ####
 <!--

BUILDING.md

@@ -5,7 +5,7 @@
 Before getting started, bear in mind that this repository includes all of Kubernetes history, so consider shallow cloning with (`--depth 1`) to speed up the process.
 
 ```bash
-git clone --depth 1 https://github.com/rancher/k3s.git
+git clone --depth 1 https://github.com/k3s-io/k3s.git
 ```
 
 The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run:

Dockerfile.dapper

@@ -39,10 +39,11 @@ RUN wget -O - ${YQ_URL}_$(go env GOARCH) > /usr/bin/yq && chmod +x /usr/bin/yq
 ARG SELINUX=true
 ENV SELINUX $SELINUX
 
-ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/rancher/k3s/.cache -v trivy-cache:/root/.cache/trivy
+ENV DAPPER_RUN_ARGS --privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.cache -v trivy-cache:/root/.cache/trivy
 ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME SKIP_VALIDATE SKIP_AIRGAP GCLOUD_AUTH GITHUB_TOKEN GOLANG
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV DAPPER_OUTPUT ./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy
+
 ENV DAPPER_DOCKER_SOCKET true
 ENV HOME ${DAPPER_SOURCE}
 ENV CROSS true

Dockerfile.test.dapper

@@ -20,7 +20,7 @@ ENV TEST_CLEANUP true
 
 ENV DAPPER_RUN_ARGS --privileged --network host -v /tmp:/tmp
 ENV DAPPER_ENV REPO TAG DRONE_TAG DRONE_BUILD_EVENT IMAGE_NAME GCLOUD_AUTH SONOBUOY_VERSION ENABLE_REGISTRY
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV DAPPER_OUTPUT ./dist
 ENV DAPPER_DOCKER_SOCKET true
 ENV HOME ${DAPPER_SOURCE}

Dockerfile.test.mod.dapper

@@ -2,7 +2,7 @@ ARG GOLANG=golang:1.17.5-alpine3.15
 FROM ${GOLANG}
 
 RUN apk -U --no-cache add bash jq
-ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
+ENV DAPPER_SOURCE /go/src/github.com/k3s-io/k3s/
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
 

cmd/agent/main.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/cert/main.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/containerd/main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/rancher/k3s/pkg/containerd"
+	"github.com/k3s-io/k3s/pkg/containerd"
 	"k8s.io/klog"
 )
 

cmd/ctr/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/rancher/k3s/pkg/ctr"
+import "github.com/k3s-io/k3s/pkg/ctr"
 
 func main() {
 	ctr.Main()

cmd/encrypt/main.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/etcdsnapshot/main.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

cmd/k3s/main.go

@@ -9,15 +9,15 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/data"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/dataverify"
+	"github.com/k3s-io/k3s/pkg/flock"
+	"github.com/k3s-io/k3s/pkg/untar"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
-	"github.com/rancher/k3s/pkg/data"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/dataverify"
-	"github.com/rancher/k3s/pkg/flock"
-	"github.com/rancher/k3s/pkg/untar"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/resolvehome"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"

cmd/kubectl/main.go

@@ -1,6 +1,6 @@
 package main
 
-import "github.com/rancher/k3s/pkg/kubectl"
+import "github.com/k3s-io/k3s/pkg/kubectl"
 
 func main() {
 	kubectl.Main()

cmd/server/main.go

@@ -7,20 +7,20 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/pkg/reexec"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/crictl"
+	"github.com/k3s-io/k3s/pkg/cli/ctr"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/cli/kubectl"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cli/server"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/containerd"
+	ctr2 "github.com/k3s-io/k3s/pkg/ctr"
+	kubectl2 "github.com/k3s-io/k3s/pkg/kubectl"
 	crictl2 "github.com/kubernetes-sigs/cri-tools/cmd/crictl"
-	"github.com/rancher/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/crictl"
-	"github.com/rancher/k3s/pkg/cli/ctr"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/cli/kubectl"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/cli/server"
-	"github.com/rancher/k3s/pkg/configfilearg"
-	"github.com/rancher/k3s/pkg/containerd"
-	ctr2 "github.com/rancher/k3s/pkg/ctr"
-	kubectl2 "github.com/rancher/k3s/pkg/kubectl"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

contrib/ansible/README.md

@@ -1,3 +1,3 @@
 # Build a Kubernetes cluster using k3s via Ansible
 
-The ansible playbook was moved to https://github.com/rancher/k3s-ansible
+The ansible playbook was moved to https://github.com/k3s-io/k3s-ansible

go.mod

@@ -1,4 +1,4 @@
-module github.com/rancher/k3s
+module github.com/k3s-io/k3s
 
 go 1.16
 
@@ -15,7 +15,6 @@ replace (
 	github.com/googleapis/gax-go/v2 => github.com/googleapis/gax-go/v2 v2.0.5
 	github.com/juju/errors => github.com/k3s-io/nocode v0.0.0-20200630202308-cb097102c09f
 	github.com/kubernetes-sigs/cri-tools => github.com/k3s-io/cri-tools v1.22.0-k3s1
-	github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009
 	github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.3
 	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417
 	github.com/rancher/wrangler => github.com/rancher/wrangler v0.8.11-0.20220211163748-d5a8ee98be5f

main.go

@@ -11,15 +11,15 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/crictl"
+	"github.com/k3s-io/k3s/pkg/cli/crictl"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/cli/kubectl"
+	"github.com/k3s-io/k3s/pkg/cli/kubectl"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/cli/server"
+	"github.com/k3s-io/k3s/pkg/cli/server"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

package/rpm/install.sh

@@ -93,7 +93,7 @@ if [ "$INSTALL_K3S_DEBUG" = "true" ]; then
     set -x
 fi
 
-GITHUB_URL=https://github.com/rancher/k3s/releases
+GITHUB_URL=https://github.com/k3s-io/k3s/releases
 STORAGE_URL=https://storage.googleapis.com/k3s-ci-builds
 DOWNLOADER=
 

pkg/agent/config/config.go

@@ -19,15 +19,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/containerd"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/containerd"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/slice"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/json"

pkg/agent/config/config_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package config
@@ -5,7 +6,7 @@ package config
 import (
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func applyContainerdStateAndAddress(nodeConfig *config.Node) {

pkg/agent/config/config_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package config
@@ -5,7 +6,7 @@ package config
 import (
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func applyContainerdStateAndAddress(nodeConfig *config.Node) {

pkg/agent/containerd/config_linux.go

@@ -9,13 +9,13 @@ import (
 	"os"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/templates"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/opencontainers/runc/libcontainer/userns"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/templates"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wharfie/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"

pkg/agent/containerd/config_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package containerd
@@ -8,9 +9,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/rancher/wharfie/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"

pkg/agent/containerd/containerd.go

@@ -19,11 +19,11 @@ import (
 	"github.com/containerd/containerd/namespaces"
 	"github.com/containerd/containerd/pkg/cri/constants"
 	"github.com/containerd/containerd/reference/docker"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wharfie/pkg/tarfile"
 	"github.com/rancher/wrangler/pkg/merr"
 	"github.com/sirupsen/logrus"

pkg/agent/containerd/nvidia.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package containerd
@@ -7,7 +8,7 @@ import (
 	"io/fs"
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
 	"github.com/sirupsen/logrus"
 )
 

pkg/agent/containerd/nvidia_test.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package containerd
@@ -8,7 +9,7 @@ import (
 	"testing"
 	"testing/fstest"
 
-	"github.com/rancher/k3s/pkg/agent/templates"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
 )
 
 func Test_UnitFindNvidiaContainerRuntimes(t *testing.T) {

pkg/agent/flannel/setup.go

@@ -8,10 +8,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/agent/flannel/setup_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func stringToCIDR(s string) []*net.IPNet {

pkg/agent/loadbalancer/config.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 
-	"github.com/rancher/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/agent/util"
 )
 
 func (lb *LoadBalancer) writeConfig() error {

pkg/agent/loadbalancer/loadbalancer.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"inet.af/tcpproxy"
 )

pkg/agent/loadbalancer/loadbalancer_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
 )
 
 type server struct {

pkg/agent/netpol/netpol.go

@@ -15,7 +15,7 @@ import (
 	"github.com/cloudnativelabs/kube-router/pkg/healthcheck"
 	"github.com/cloudnativelabs/kube-router/pkg/options"
 	"github.com/cloudnativelabs/kube-router/pkg/utils"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"

pkg/agent/netpol/netpol_windows.go

@@ -3,7 +3,7 @@ package netpol
 import (
 	"context"
 
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func Run(ctx context.Context, nodeConfig *daemonconfig.Node) error {

pkg/agent/proxy/apiproxy.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
 )
 
 type Proxy interface {

pkg/agent/run.go

@@ -11,24 +11,24 @@ import (
 	"time"
 
 	systemd "github.com/coreos/go-systemd/daemon"
+	"github.com/k3s-io/k3s/pkg/agent/config"
+	"github.com/k3s-io/k3s/pkg/agent/containerd"
+	"github.com/k3s-io/k3s/pkg/agent/flannel"
+	"github.com/k3s-io/k3s/pkg/agent/netpol"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/agent/syssetup"
+	"github.com/k3s-io/k3s/pkg/agent/tunnel"
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	cp "github.com/k3s-io/k3s/pkg/cloudprovider"
+	"github.com/k3s-io/k3s/pkg/daemons/agent"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/nodeconfig"
+	"github.com/k3s-io/k3s/pkg/rootless"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/config"
-	"github.com/rancher/k3s/pkg/agent/containerd"
-	"github.com/rancher/k3s/pkg/agent/flannel"
-	"github.com/rancher/k3s/pkg/agent/netpol"
-	"github.com/rancher/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/agent/syssetup"
-	"github.com/rancher/k3s/pkg/agent/tunnel"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	cp "github.com/rancher/k3s/pkg/cloudprovider"
-	"github.com/rancher/k3s/pkg/daemons/agent"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/nodeconfig"
-	"github.com/rancher/k3s/pkg/rootless"
-	"github.com/rancher/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"

pkg/agent/run_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package agent
@@ -7,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 const (

pkg/agent/run_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -8,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 const (

pkg/agent/templates/templates.go

@@ -3,7 +3,7 @@ package templates
 import (
 	"github.com/rancher/wharfie/pkg/registries"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 type ContainerdRuntimeConfig struct {

pkg/agent/tunnel/tunnel.go

@@ -10,10 +10,10 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
-	"github.com/rancher/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/remotedialer"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"

pkg/apiaddresses/controller.go

@@ -5,10 +5,10 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	v1 "k8s.io/api/core/v1"

pkg/apis/k3s.cattle.io/v1/zz_generated_register.go

@@ -21,7 +21,7 @@ limitations under the License.
 package v1
 
 import (
-	k3s "github.com/rancher/k3s/pkg/apis/k3s.cattle.io"
+	k3s "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

pkg/authenticator/basicauth/basicauth.go

@@ -20,7 +20,7 @@ import (
 	"errors"
 	"net/http"
 
-	localAuthenticator "github.com/rancher/k3s/pkg/authenticator"
+	localAuthenticator "github.com/k3s-io/k3s/pkg/authenticator"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 )
 

pkg/bootstrap/bootstrap.go

@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 )
 

pkg/bootstrap/bootstrap_test.go

@@ -3,7 +3,7 @@ package bootstrap
 import (
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func TestObjToMap(t *testing.T) {

pkg/cgroups/cgroups_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cgroups
@@ -13,7 +14,7 @@ import (
 
 	"github.com/containerd/cgroups"
 	cgroupsv2 "github.com/containerd/cgroups/v2"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 )
 

pkg/cli/agent/agent.go

@@ -6,12 +6,12 @@ import (
 	"runtime"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/agent"
+	"github.com/k3s-io/k3s/pkg/agent"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/netutil"
+	"github.com/k3s-io/k3s/pkg/netutil"
-	"github.com/rancher/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"

pkg/cli/cert/cert.go

@@ -9,13 +9,13 @@ import (
 	"time"
 
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/otiai10/copy"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

pkg/cli/cmds/agent.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/certs.go

@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/config.go

@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/etcd_snapshot.go

@@ -3,7 +3,7 @@ package cmds
 import (
 	"time"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/log_linux.go

@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package cmds
@@ -11,9 +12,9 @@ import (
 
 	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/natefinch/lumberjack"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"golang.org/x/sys/unix"
 )
 

pkg/cli/cmds/root.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/secrets_encrypt.go

@@ -1,7 +1,7 @@
 package cmds
 
 import (
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/cmds/server.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 )
 

pkg/cli/ctr/ctr.go

@@ -1,7 +1,7 @@
 package ctr
 
 import (
-	"github.com/rancher/k3s/pkg/ctr"
+	"github.com/k3s-io/k3s/pkg/ctr"
 	"github.com/urfave/cli"
 )
 

pkg/cli/etcdsnapshot/etcd_snapshot.go

@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/server"
-	util2 "github.com/rancher/k3s/pkg/util"
+	util2 "github.com/k3s-io/k3s/pkg/util"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/urfave/cli"
 	"gopkg.in/yaml.v2"

pkg/cli/kubectl/kubectl.go

@@ -1,7 +1,7 @@
 package kubectl
 
 import (
-	"github.com/rancher/k3s/pkg/kubectl"
+	"github.com/k3s-io/k3s/pkg/kubectl"
 	"github.com/urfave/cli"
 )
 

pkg/cli/secretsencrypt/secrets_encrypt.go

@@ -11,11 +11,11 @@ import (
 	"text/tabwriter"
 
 	"github.com/erikdubbelboer/gspt"
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/secretsencrypt"
-	"github.com/rancher/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/urfave/cli"
 	"k8s.io/utils/pointer"
 )

pkg/cli/server/server.go

@@ -11,20 +11,20 @@ import (
 
 	systemd "github.com/coreos/go-systemd/daemon"
 	"github.com/erikdubbelboer/gspt"
+	"github.com/k3s-io/k3s/pkg/agent"
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/datadir"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/netutil"
+	"github.com/k3s-io/k3s/pkg/rootless"
+	"github.com/k3s-io/k3s/pkg/server"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/datadir"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/netutil"
-	"github.com/rancher/k3s/pkg/rootless"
-	"github.com/rancher/k3s/pkg/server"
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/signals"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"

pkg/clientaccess/token_test.go

@@ -11,10 +11,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/rancher/dynamiclistener/cert"
 	"github.com/rancher/dynamiclistener/factory"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/cloudprovider/cloudprovider.go

@@ -3,7 +3,7 @@ package cloudprovider
 import (
 	"io"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"k8s.io/client-go/informers"
 	informercorev1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/tools/cache"

pkg/cloudprovider/instances.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"

pkg/cluster/bootstrap.go

@@ -15,15 +15,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/client"
 	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/otiai10/copy"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 )
 

pkg/cluster/bootstrap_test.go

@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func Test_isDirEmpty(t *testing.T) {

pkg/cluster/cluster.go

@@ -6,12 +6,12 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
 	"github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
 	"github.com/sirupsen/logrus"
 )
 

pkg/cluster/encrypt.go

@@ -12,7 +12,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/token"
 	"golang.org/x/crypto/pbkdf2"
 )
 

pkg/cluster/etcd.go

@@ -1,8 +1,8 @@
 package cluster
 
 import (
-	"github.com/rancher/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/etcd"
 )
 
 func init() {

pkg/cluster/https.go

@@ -11,14 +11,14 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/rancher/dynamiclistener"
 	"github.com/rancher/dynamiclistener/factory"
 	"github.com/rancher/dynamiclistener/storage/file"
 	"github.com/rancher/dynamiclistener/storage/kubernetes"
 	"github.com/rancher/dynamiclistener/storage/memory"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/generated/controllers/core"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/cluster/managed.go

@@ -12,11 +12,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/cluster/managed"
+	"github.com/k3s-io/k3s/pkg/etcd"
+	"github.com/k3s-io/k3s/pkg/nodepassword"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/endpoint"
-	"github.com/rancher/k3s/pkg/cluster/managed"
-	"github.com/rancher/k3s/pkg/etcd"
-	"github.com/rancher/k3s/pkg/nodepassword"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 )

pkg/cluster/managed/drivers.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/rancher/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 var (

pkg/cluster/storage.go

@@ -9,10 +9,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/bootstrap"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/k3s-io/kine/pkg/client"
-	"github.com/rancher/k3s/pkg/bootstrap"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 )
 

pkg/codegen/main.go

@@ -4,14 +4,14 @@ import (
 	"os"
 
 	bindata "github.com/go-bindata/go-bindata"
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	controllergen "github.com/rancher/wrangler/pkg/controller-gen"
 	"github.com/rancher/wrangler/pkg/controller-gen/args"
 	"github.com/sirupsen/logrus"
 )
 
 var (
-	basePackage = "github.com/rancher/k3s/types"
+	basePackage = "github.com/k3s-io/k3s/types"
 )
 
 func main() {
@@ -68,7 +68,7 @@ func main() {
 	}
 
 	controllergen.Run(args.Options{
-		OutputPackage: "github.com/rancher/k3s/pkg/generated",
+		OutputPackage: "github.com/k3s-io/k3s/pkg/generated",
 		Boilerplate:   "scripts/boilerplate.go.txt",
 		Groups: map[string]args.Group{
 			"k3s.cattle.io": {

pkg/configfilearg/defaultparser.go

@@ -1,8 +1,8 @@
 package configfilearg
 
 import (
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

pkg/configfilearg/parser.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/agent/util"
 	"github.com/rancher/wrangler/pkg/data/convert"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"

pkg/containerd/utility_windows.go

@@ -1,10 +1,11 @@
+//go:build windows
 // +build windows
 
 package containerd
 
 import (
+	util2 "github.com/k3s-io/k3s/pkg/util"
 	"github.com/pkg/errors"
-	util2 "github.com/rancher/k3s/pkg/util"
 )
 
 func OverlaySupported(root string) error {

pkg/daemons/agent/agent.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/rancher/k3s/pkg/agent/config"
+	"github.com/k3s-io/k3s/pkg/agent/config"
-	"github.com/rancher/k3s/pkg/agent/proxy"
+	"github.com/k3s-io/k3s/pkg/agent/proxy"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
 	"github.com/sirupsen/logrus"
 	"k8s.io/component-base/logs"
 	_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration

pkg/daemons/agent/agent_linux.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package agent
@@ -7,10 +8,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/k3s-io/k3s/pkg/cgroups"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/opencontainers/runc/libcontainer/userns"
-	"github.com/rancher/k3s/pkg/cgroups"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 	"k8s.io/apimachinery/pkg/util/net"

pkg/daemons/agent/agent_windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -9,8 +10,8 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/util"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/kubernetes/pkg/kubeapiserver/authorizer/modes"

pkg/daemons/agent/agent_windows_test.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package agent
@@ -5,7 +6,7 @@ package agent
 import (
 	"testing"
 
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 )
 
 func TestCheckRuntimeEndpoint(t *testing.T) {

pkg/daemons/control/auth.go

@@ -1,8 +1,8 @@
 package control
 
 import (
-	"github.com/rancher/k3s/pkg/authenticator/basicauth"
+	"github.com/k3s-io/k3s/pkg/authenticator/basicauth"
-	"github.com/rancher/k3s/pkg/authenticator/passwordfile"
+	"github.com/k3s-io/k3s/pkg/authenticator/passwordfile"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/group"
 	"k8s.io/apiserver/pkg/authentication/request/union"

pkg/daemons/control/deps/deps.go

@@ -18,12 +18,12 @@ import (
 	"text/template"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/passwd"
+	"github.com/k3s-io/k3s/pkg/token"
+	"github.com/k3s-io/k3s/pkg/version"
 	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/passwd"
-	"github.com/rancher/k3s/pkg/token"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"

pkg/daemons/control/server.go

@@ -10,13 +10,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/cluster"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/util"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/cluster"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/util"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	authorizationv1 "k8s.io/api/authorization/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/daemons/executor/embed.go

@@ -1,3 +1,4 @@
+//go:build !no_embedded_executor
 // +build !no_embedded_executor
 
 package executor
@@ -9,9 +10,9 @@ import (
 	"net/http"
 	"runtime"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,7 +35,7 @@ import (
 	kubelet "k8s.io/kubernetes/cmd/kubelet/app"
 
 	// registering k3s cloud provider
-	_ "github.com/rancher/k3s/pkg/cloudprovider"
+	_ "github.com/k3s-io/k3s/pkg/cloudprovider"
 )
 
 func init() {

pkg/daemons/executor/etcd.go

@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/sirupsen/logrus"
 	"go.etcd.io/etcd/server/v3/embed"
 	"go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp"

pkg/daemons/executor/executor.go

@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
-	daemonconfig "github.com/rancher/k3s/pkg/daemons/config"
+	daemonconfig "github.com/k3s-io/k3s/pkg/daemons/config"
 	yaml2 "gopkg.in/yaml.v2"
 	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"sigs.k8s.io/yaml"

pkg/datadir/datadir.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/version"
 	"github.com/rancher/wrangler/pkg/resolvehome"
 )
 

pkg/deploy/controller.go

@@ -14,11 +14,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/agent/util"
+	apisv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
+	controllersv1 "github.com/k3s-io/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
+	pkgutil "github.com/k3s-io/k3s/pkg/util"
 	errors2 "github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/util"
-	apisv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
-	controllersv1 "github.com/rancher/k3s/pkg/generated/controllers/k3s.cattle.io/v1"
-	pkgutil "github.com/rancher/k3s/pkg/util"
 	"github.com/rancher/wrangler/pkg/apply"
 	"github.com/rancher/wrangler/pkg/merr"
 	"github.com/rancher/wrangler/pkg/objectset"

pkg/etcd/etcd.go

@@ -22,17 +22,17 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/gorilla/mux"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/control/deps"
+	"github.com/k3s-io/k3s/pkg/daemons/executor"
+	"github.com/k3s-io/k3s/pkg/version"
 	"github.com/k3s-io/kine/pkg/client"
 	endpoint2 "github.com/k3s-io/kine/pkg/endpoint"
 	"github.com/minio/minio-go/v7"
 	cp "github.com/otiai10/copy"
 	"github.com/pkg/errors"
 	certutil "github.com/rancher/dynamiclistener/cert"
-	"github.com/rancher/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
-	"github.com/rancher/k3s/pkg/daemons/control/deps"
-	"github.com/rancher/k3s/pkg/daemons/executor"
-	"github.com/rancher/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/robfig/cron/v3"
 	"github.com/sirupsen/logrus"

pkg/etcd/etcd_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/rancher/k3s/pkg/clientaccess"
+	"github.com/k3s-io/k3s/pkg/clientaccess"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
-	testutil "github.com/rancher/k3s/tests/util"
+	testutil "github.com/k3s-io/k3s/tests/util"
 	"github.com/robfig/cron/v3"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"go.etcd.io/etcd/server/v3/etcdserver"

pkg/etcd/etcdproxy.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"net/url"
 
+	"github.com/k3s-io/k3s/pkg/agent/loadbalancer"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/agent/loadbalancer"
 )
 
 type Proxy interface {

pkg/etcd/member_controller.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/k3s/pkg/version"
+	"github.com/k3s-io/k3s/pkg/version"
 	controllerv1 "github.com/rancher/wrangler/pkg/generated/controllers/core/v1"
 	"github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"

pkg/etcd/s3.go

@@ -16,10 +16,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 	"github.com/pkg/errors"
-	"github.com/rancher/k3s/pkg/daemons/config"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/flock/flock_int_test.go

@@ -1,11 +1,14 @@
+//go:build linux || darwin || freebsd || openbsd || netbsd || dragonfly
+// +build linux darwin freebsd openbsd netbsd dragonfly
+
 package flock_test
 
 import (
 	"testing"
 
+	"github.com/k3s-io/k3s/pkg/flock"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/rancher/k3s/pkg/flock"
 )
 
 const lockfile = "/tmp/testlock.test"

pkg/flock/flock_other.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin && !freebsd && !openbsd && !netbsd && !dragonfly
 // +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly
 
 /*
@@ -23,7 +24,18 @@ func Acquire(path string) (int, error) {
 	return -1, nil
 }
 
+// AcquireShared creates a shared lock on a file for the duration of the process, or until Release(d).
+// This method is reentrant.
+func AcquireShared(path string) (int, error) {
+	return 0, nil
+}
+
 // Release is not implemented on non-unix systems.
 func Release(lock int) error {
 	return nil
 }
+
+// CheckLock checks whether any process is using the lock
+func CheckLock(path string) bool {
+	return false
+}

pkg/generated/clientset/versioned/clientset.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"net/http"
 
-	k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"

pkg/generated/clientset/versioned/fake/clientset_generated.go

@@ -19,9 +19,9 @@ limitations under the License.
 package fake
 
 import (
-	clientset "github.com/rancher/k3s/pkg/generated/clientset/versioned"
+	clientset "github.com/k3s-io/k3s/pkg/generated/clientset/versioned"
-	k3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1"
-	fakek3sv1 "github.com/rancher/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake"
+	fakek3sv1 "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/fake"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/discovery"

pkg/generated/clientset/versioned/fake/register.go

@@ -19,7 +19,7 @@ limitations under the License.
 package fake
 
 import (
-	k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"

pkg/generated/clientset/versioned/scheme/register.go

@@ -19,7 +19,7 @@ limitations under the License.
 package scheme
 
 import (
-	k3sv1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	k3sv1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"

pkg/generated/clientset/versioned/typed/k3s.cattle.io/v1/addon.go

@@ -22,8 +22,8 @@ import (
 	"context"
 	"time"
 
-	v1 "github.com/rancher/k3s/pkg/apis/k3s.cattle.io/v1"
+	v1 "github.com/k3s-io/k3s/pkg/apis/k3s.cattle.io/v1"
-	scheme "github.com/rancher/k3s/pkg/generated/clientset/versioned/scheme"
+	scheme "github.com/k3s-io/k3s/pkg/generated/clientset/versioned/scheme"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"