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

* changing package to k3s-io Signed-off-by: Luther Monson <[email protected]> Co-authored-by: Derek Nola <[email protected]>
kittydoor · Mar 2, 2022 · 9a849b1 · 9a849b1
1 parent a82ac4f
commit 9a849b1
Show file tree

Hide file tree

Showing 142 changed files with 371 additions and 341 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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 ####
 <!--

diff --git a/BUILDING.md b/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:

diff --git a/Dockerfile.dapper b/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

diff --git a/Dockerfile.test.dapper b/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}

diff --git a/Dockerfile.test.mod.dapper b/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}
 

diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/agent"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/agent"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

diff --git a/cmd/cert/main.go b/cmd/cert/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cert"
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cert"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

diff --git a/cmd/containerd/main.go b/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"
 )
 

diff --git a/cmd/ctr/main.go b/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()

diff --git a/cmd/encrypt/main.go b/cmd/encrypt/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/secretsencrypt"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/secretsencrypt"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

diff --git a/cmd/etcdsnapshot/main.go b/cmd/etcdsnapshot/main.go
@@ -5,9 +5,9 @@ import (
 	"errors"
 	"os"
 
-	"github.com/rancher/k3s/pkg/cli/cmds"
-	"github.com/rancher/k3s/pkg/cli/etcdsnapshot"
-	"github.com/rancher/k3s/pkg/configfilearg"
+	"github.com/k3s-io/k3s/pkg/cli/cmds"
+	"github.com/k3s-io/k3s/pkg/cli/etcdsnapshot"
+	"github.com/k3s-io/k3s/pkg/configfilearg"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

diff --git a/cmd/k3s/main.go b/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"

diff --git a/cmd/kubectl/main.go b/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()

diff --git a/cmd/server/main.go b/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"
 )

diff --git a/contrib/ansible/README.md b/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
diff --git a/go.mod b/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

diff --git a/main.go b/main.go
@@ -11,15 +11,15 @@ import (
 	"errors"
 	"os"
 
-	"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/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/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/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/sirupsen/logrus"
 	"github.com/urfave/cli"
 )

diff --git a/package/rpm/install.sh b/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=
 

diff --git a/pkg/agent/config/config.go b/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"

diff --git a/pkg/agent/config/config_linux.go b/pkg/agent/config/config_linux.go
@@ -1,11 +1,12 @@
+//go:build linux
 // +build linux
 
 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) {

diff --git a/pkg/agent/config/config_windows.go b/pkg/agent/config/config_windows.go
@@ -1,11 +1,12 @@
+//go:build windows
 // +build windows
 
 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) {

diff --git a/pkg/agent/containerd/config_linux.go b/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"

diff --git a/pkg/agent/containerd/config_windows.go b/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"
-	util2 "github.com/rancher/k3s/pkg/agent/util"
-	"github.com/rancher/k3s/pkg/daemons/config"
+	"github.com/k3s-io/k3s/pkg/agent/templates"
+	util2 "github.com/k3s-io/k3s/pkg/agent/util"
+	"github.com/k3s-io/k3s/pkg/daemons/config"
 	"github.com/rancher/wharfie/pkg/registries"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"

diff --git a/pkg/agent/containerd/containerd.go b/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"

diff --git a/pkg/agent/containerd/nvidia.go b/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"
 )
 

diff --git a/pkg/agent/containerd/nvidia_test.go b/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) {

diff --git a/pkg/agent/flannel/setup.go b/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"

diff --git a/pkg/agent/flannel/setup_test.go b/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 {