chore: changes from org move (#90)

This includes various changes as a result of moving the repo to the k3s
org.

Signed-off-by: Richard Case <[email protected]>

.golangci.yml

@@ -86,15 +86,15 @@ linters-settings:
           - sigs.k8s.io/controller-runtime
           - sigs.k8s.io/cluster-api
 
-          - github.com/cluster-api-provider-k3s/cluster-api-k3s
+          - github.com/k3s-io/cluster-api-k3s
 
           - github.com/google/uuid
           - github.com/pkg/errors
   gci:
     sections:
       - standard
       - default
-      - prefix(github.com/cluster-api-provider-k3s/cluster-api-k3s)
+      - prefix(github.com/k3s-io/cluster-api-k3s)
   gomoddirectives:
     # List of allowed `replace` directives.
     # Default: []
@@ -103,7 +103,7 @@ linters-settings:
   goimports:
     # put imports beginning with prefix after 3rd-party packages;
     # it's a comma-separated list of prefixes
-    local-prefixes: github.com/cluster-api-provider-k3s/cluster-api-k3s
+    local-prefixes: github.com/k3s-io/cluster-api-k3s
   godot:
     #   declarations - for top level declaration comments (default);
     #   toplevel     - for top level comments;

Makefile

@@ -110,7 +110,7 @@ $(RELEASE_DIR):
 $(RELEASE_NOTES_DIR):
 	mkdir -p $(RELEASE_NOTES_DIR)/
 
-REGISTRY ?= ghcr.io/cluster-api-provider-k3s/cluster-api-k3s
+REGISTRY ?= ghcr.io/k3s-io/cluster-api-k3s
 
 # Image URL to use all building/pushing image targets
 BOOTSTRAP_IMG_TAG ?= $(RELEASE_TAG)

bootstrap/PROJECT

@@ -1,5 +1,5 @@
 domain: cluster.x-k8s.io
-repo: github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap
+repo: github.com/k3s-io/cluster-api-k3s/bootstrap
 resources:
 - group: bootstrap
   kind: KThreesConfig

bootstrap/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml

@@ -71,7 +71,7 @@ spec:
                 description: InfrastructureTemplate is a required reference to a custom
                   resource offered by an infrastructure provider. In the next API
                   version we will move this into the `KThreesControlPlaneMachineTemplate`
-                  struct. See https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/62
+                  struct. See https://github.com/k3s-io/cluster-api-k3s/issues/62
                 properties:
                   apiVersion:
                     description: API version of the referent.

bootstrap/config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller
+  newName: ghcr.io/k3s-io/cluster-api-k3s/bootstrap-controller
   newTag: v0.1.7

bootstrap/controllers/kthreesconfig_controller.go

@@ -41,14 +41,14 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	kubeyaml "sigs.k8s.io/yaml"
 
-	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/cloudinit"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/kubeconfig"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/locking"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/token"
+	bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/pkg/cloudinit"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd"
+	"github.com/k3s-io/cluster-api-k3s/pkg/k3s"
+	"github.com/k3s-io/cluster-api-k3s/pkg/kubeconfig"
+	"github.com/k3s-io/cluster-api-k3s/pkg/locking"
+	"github.com/k3s-io/cluster-api-k3s/pkg/secret"
+	"github.com/k3s-io/cluster-api-k3s/pkg/token"
 )
 
 // InitLocker is a lock that is used around k3s init.

bootstrap/controllers/suite_test.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1beta1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

bootstrap/main.go

@@ -29,8 +29,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/controllers"
+	bootstrapv1beta1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/bootstrap/controllers"
 )
 
 var (

controlplane/PROJECT

@@ -1,5 +1,5 @@
 domain: cluster.x-k8s.io
-repo: github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane
+repo: github.com/k3s-io/cluster-api-k3s/controlplane
 resources:
 - group: controlplane
   kind: KThreesControlPlane

controlplane/api/v1beta1/kthreescontrolplane_types.go

@@ -23,8 +23,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	cabp3v1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/errors"
+	cabp3v1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/pkg/errors"
 )
 
 const (
@@ -70,7 +70,7 @@ type KThreesControlPlaneSpec struct {
 	// offered by an infrastructure provider.
 	// In the next API version we will move this into the
 	// `KThreesControlPlaneMachineTemplate` struct. See
-	// https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/62
+	// https://github.com/k3s-io/cluster-api-k3s/issues/62
 	InfrastructureTemplate corev1.ObjectReference `json:"infrastructureTemplate"`
 
 	// KThreesConfigSpec is a KThreesConfigSpec
@@ -102,7 +102,7 @@ type KThreesControlPlaneSpec struct {
 // MachineTemplate contains information about how machines should be shaped
 // when creating or updating a control plane.
 // In the next API version we will move the InfrastructureTemplate field into
-// this struct. See https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/62
+// this struct. See https://github.com/k3s-io/cluster-api-k3s/issues/62
 type KThreesControlPlaneMachineTemplate struct {
 	// Standard object's metadata.
 	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata

controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml

@@ -71,7 +71,7 @@ spec:
                 description: InfrastructureTemplate is a required reference to a custom
                   resource offered by an infrastructure provider. In the next API
                   version we will move this into the `KThreesControlPlaneMachineTemplate`
-                  struct. See https://github.com/cluster-api-provider-k3s/cluster-api-k3s/issues/62
+                  struct. See https://github.com/k3s-io/cluster-api-k3s/issues/62
                 properties:
                   apiVersion:
                     description: API version of the referent.

controlplane/config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller
+  newName: ghcr.io/k3s-io/cluster-api-k3s/controlplane-controller
   newTag: v0.1.7

controlplane/controllers/kthreescontrolplane_controller.go

@@ -45,12 +45,12 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
-	k3s "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/kubeconfig"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/token"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
+	k3s "github.com/k3s-io/cluster-api-k3s/pkg/k3s"
+	"github.com/k3s-io/cluster-api-k3s/pkg/kubeconfig"
+	"github.com/k3s-io/cluster-api-k3s/pkg/machinefilters"
+	"github.com/k3s-io/cluster-api-k3s/pkg/secret"
+	"github.com/k3s-io/cluster-api-k3s/pkg/token"
 )
 
 // KThreesControlPlaneReconciler reconciles a KThreesControlPlane object.

controlplane/controllers/remediation.go

@@ -33,8 +33,8 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
-	k3s "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
+	k3s "github.com/k3s-io/cluster-api-k3s/pkg/k3s"
 )
 
 // reconcileUnhealthyMachines tries to remediate KThreesControlPlane unhealthy machines

controlplane/controllers/scale.go

@@ -35,10 +35,10 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
-	k3s "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/k3s"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
+	bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
+	k3s "github.com/k3s-io/cluster-api-k3s/pkg/k3s"
+	"github.com/k3s-io/cluster-api-k3s/pkg/machinefilters"
 )
 
 var ErrPreConditionFailed = errors.New("precondition check failed")

controlplane/controllers/suite_test.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 
-	controlplanev1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1beta1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

controlplane/main.go

@@ -29,10 +29,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	bootstrapv1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	controlplanev1beta1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/controllers"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd"
+	bootstrapv1beta1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	controlplanev1beta1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/controlplane/controllers"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd"
 )
 
 var (

go.mod

@@ -1,4 +1,4 @@
-module github.com/cluster-api-provider-k3s/cluster-api-k3s
+module github.com/k3s-io/cluster-api-k3s
 
 go 1.20
 

hack/version.sh

@@ -33,10 +33,10 @@ version::get_version_vars() {
         # compatible semantic version that looks something like this:
         #   v1.1.0-alpha.0.6+84c76d1142ea4d
         DASHES_IN_VERSION=$(echo "${GIT_VERSION}" | sed "s/[^-]//g")
-        if [[ "${DASHES_IN_VERSION}" == "---" ]] ; then
+        if [[ "${DASHES_IN_VERSION}" == "---" ]]; then
             # We have distance to subversion (v1.1.0-subversion-1-gCommitHash)
             GIT_VERSION=$(echo "${GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{14\}\)$/.\1\-\2/")
-        elif [[ "${DASHES_IN_VERSION}" == "--" ]] ; then
+        elif [[ "${DASHES_IN_VERSION}" == "--" ]]; then
             # We have distance to base tag (v1.1.0-1-gCommitHash)
             GIT_VERSION=$(echo "${GIT_VERSION}" | sed "s/-g\([0-9a-f]\{14\}\)$/-\1/")
         fi
@@ -47,7 +47,6 @@ version::get_version_vars() {
             GIT_VERSION+="-dirty"
         fi
 
-
         # Try to match the "git describe" output to a regex to try to extract
         # the "major" and "minor" versions and whether this is the exact tagged
         # version or whether the tree is between two tagged versions.
@@ -77,7 +76,7 @@ version::ldflags() {
         local key=${1}
         local val=${2}
         ldflags+=(
-            "-X 'github.com/cluster-api-provider-k3s/cluster-api-k3s/version.${key}=${val}'"
+            "-X 'github.com/k3s-io/cluster-api-k3s/version.${key}=${val}'"
         )
     }
 

pkg/cloudinit/cloudinit.go

@@ -22,7 +22,7 @@ import (
 	"strings"
 	"text/template"
 
-	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 var (

pkg/cloudinit/controlplane_init.go

@@ -19,7 +19,7 @@ package cloudinit
 import (
 	"fmt"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
+	"github.com/k3s-io/cluster-api-k3s/pkg/secret"
 )
 
 const (

pkg/cloudinit/controlplane_init_test.go

@@ -21,8 +21,8 @@ import (
 
 	. "github.com/onsi/gomega"
 
-	infrav1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
+	infrav1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/pkg/secret"
 )
 
 func TestControlPlaneInit(t *testing.T) {

pkg/etcd/etcd.go

@@ -28,7 +28,7 @@ import (
 	"google.golang.org/grpc"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/proxy"
+	"github.com/k3s-io/cluster-api-k3s/pkg/proxy"
 )
 
 // GRPCDial is a function that creates a connection to a given endpoint.

pkg/etcd/etcd_test.go

@@ -25,7 +25,7 @@ import (
 	clientv3 "go.etcd.io/etcd/client/v3"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	etcdfake "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd/fake"
+	etcdfake "github.com/k3s-io/cluster-api-k3s/pkg/etcd/fake"
 )
 
 var (

pkg/etcd/util/util.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd"
 )
 
 // TODO: find document confirmation of mapping between etcd member and node in k3s.

pkg/k3s/config.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
 )
 
 const DefaultK3sConfigLocation = "/etc/rancher/k3s/config.yaml"

pkg/k3s/control_plane.go

@@ -34,9 +34,9 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	bootstrapv1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/bootstrap/api/v1beta1"
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
+	bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
+	"github.com/k3s-io/cluster-api-k3s/pkg/machinefilters"
 )
 
 var (

pkg/k3s/etcd_client_generator.go

@@ -29,9 +29,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd/util"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/proxy"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd/util"
+	"github.com/k3s-io/cluster-api-k3s/pkg/proxy"
 )
 
 // EtcdClientGenerator generates etcd clients that connect to specific etcd members on particular control plane nodes.

pkg/k3s/machine_collection.go

@@ -33,7 +33,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/conditions"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
+	"github.com/k3s-io/cluster-api-k3s/pkg/machinefilters"
 )
 
 // FilterableMachineCollection is a set of Machines.

pkg/k3s/management_cluster.go

@@ -15,8 +15,8 @@ import (
 	"sigs.k8s.io/cluster-api/controllers/remote"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/machinefilters"
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret"
+	"github.com/k3s-io/cluster-api-k3s/pkg/machinefilters"
+	"github.com/k3s-io/cluster-api-k3s/pkg/secret"
 )
 
 // ManagementCluster defines all behaviors necessary for something to function as a management cluster.

pkg/k3s/workload_cluster.go

@@ -24,7 +24,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
 )
 
 const (

pkg/k3s/workload_cluster_coredns.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/cluster-api/util/version"
 
-	controlplanev1 "github.com/cluster-api-provider-k3s/cluster-api-k3s/controlplane/api/v1beta1"
+	controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1"
 )
 
 const (

pkg/k3s/workload_cluster_etcd.go

@@ -23,8 +23,8 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	"github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd"
-	etcdutil "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/etcd/util"
+	"github.com/k3s-io/cluster-api-k3s/pkg/etcd"
+	etcdutil "github.com/k3s-io/cluster-api-k3s/pkg/etcd/util"
 )
 
 type etcdClientFor interface {