From 2f6c526246c25ad887e1ecbb940b59f5cc315f44 Mon Sep 17 00:00:00 2001 From: Richard Case Date: Wed, 7 Feb 2024 19:38:48 +0000 Subject: [PATCH] chore: changes from org move This includes various changes as a result of moving the repo to the k3s org. Signed-off-by: Richard Case --- .golangci.yml | 6 +++--- Makefile | 2 +- bootstrap/PROJECT | 2 +- ...ne.cluster.x-k8s.io_kthreescontrolplanes.yaml | 2 +- bootstrap/config/manager/kustomization.yaml | 2 +- .../controllers/kthreesconfig_controller.go | 16 ++++++++-------- bootstrap/controllers/suite_test.go | 2 +- bootstrap/main.go | 4 ++-- controlplane/PROJECT | 2 +- .../api/v1beta1/kthreescontrolplane_types.go | 8 ++++---- ...ne.cluster.x-k8s.io_kthreescontrolplanes.yaml | 2 +- controlplane/config/manager/kustomization.yaml | 2 +- .../kthreescontrolplane_controller.go | 12 ++++++------ controlplane/controllers/remediation.go | 4 ++-- controlplane/controllers/scale.go | 8 ++++---- controlplane/controllers/suite_test.go | 2 +- controlplane/main.go | 8 ++++---- go.mod | 2 +- hack/version.sh | 7 +++---- pkg/cloudinit/cloudinit.go | 2 +- pkg/cloudinit/controlplane_init.go | 2 +- pkg/cloudinit/controlplane_init_test.go | 4 ++-- pkg/etcd/etcd.go | 2 +- pkg/etcd/etcd_test.go | 2 +- pkg/etcd/util/util.go | 2 +- pkg/k3s/config.go | 2 +- pkg/k3s/control_plane.go | 6 +++--- pkg/k3s/etcd_client_generator.go | 6 +++--- pkg/k3s/machine_collection.go | 2 +- pkg/k3s/management_cluster.go | 4 ++-- pkg/k3s/workload_cluster.go | 2 +- pkg/k3s/workload_cluster_coredns.go | 2 +- pkg/k3s/workload_cluster_etcd.go | 4 ++-- pkg/kubeconfig/kubeconfig.go | 2 +- pkg/machinefilters/machine_filters.go | 4 ++-- pkg/secret/certificates.go | 2 +- tilt-provider.yaml | 4 ++-- 37 files changed, 73 insertions(+), 74 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index f406518e..0783b6a9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -86,7 +86,7 @@ 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 @@ -94,7 +94,7 @@ linters-settings: 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; diff --git a/Makefile b/Makefile index 900c9c0d..2f50cbe3 100644 --- a/Makefile +++ b/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) diff --git a/bootstrap/PROJECT b/bootstrap/PROJECT index a396209c..7076e096 100644 --- a/bootstrap/PROJECT +++ b/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 diff --git a/bootstrap/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml b/bootstrap/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml index 1bb281d7..466be8ea 100644 --- a/bootstrap/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml +++ b/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. diff --git a/bootstrap/config/manager/kustomization.yaml b/bootstrap/config/manager/kustomization.yaml index a57bd0fa..3268942c 100644 --- a/bootstrap/config/manager/kustomization.yaml +++ b/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 diff --git a/bootstrap/controllers/kthreesconfig_controller.go b/bootstrap/controllers/kthreesconfig_controller.go index de2756c3..697eff67 100644 --- a/bootstrap/controllers/kthreesconfig_controller.go +++ b/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. diff --git a/bootstrap/controllers/suite_test.go b/bootstrap/controllers/suite_test.go index b86d5562..f2d9c79f 100644 --- a/bootstrap/controllers/suite_test.go +++ b/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 diff --git a/bootstrap/main.go b/bootstrap/main.go index 188c62fb..1ecf931a 100644 --- a/bootstrap/main.go +++ b/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 ( diff --git a/controlplane/PROJECT b/controlplane/PROJECT index 8f8a4875..61b7a3dc 100644 --- a/controlplane/PROJECT +++ b/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 diff --git a/controlplane/api/v1beta1/kthreescontrolplane_types.go b/controlplane/api/v1beta1/kthreescontrolplane_types.go index 95ec8537..a9c7516a 100644 --- a/controlplane/api/v1beta1/kthreescontrolplane_types.go +++ b/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 diff --git a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml b/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml index 1bb281d7..466be8ea 100644 --- a/controlplane/config/crd/bases/controlplane.cluster.x-k8s.io_kthreescontrolplanes.yaml +++ b/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. diff --git a/controlplane/config/manager/kustomization.yaml b/controlplane/config/manager/kustomization.yaml index 85d5a44b..e271bdde 100644 --- a/controlplane/config/manager/kustomization.yaml +++ b/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 diff --git a/controlplane/controllers/kthreescontrolplane_controller.go b/controlplane/controllers/kthreescontrolplane_controller.go index 193ca11f..677ef511 100644 --- a/controlplane/controllers/kthreescontrolplane_controller.go +++ b/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. diff --git a/controlplane/controllers/remediation.go b/controlplane/controllers/remediation.go index b7b33bac..d85e8a57 100644 --- a/controlplane/controllers/remediation.go +++ b/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 diff --git a/controlplane/controllers/scale.go b/controlplane/controllers/scale.go index a2bc2fef..d72f6879 100644 --- a/controlplane/controllers/scale.go +++ b/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") diff --git a/controlplane/controllers/suite_test.go b/controlplane/controllers/suite_test.go index dc60c0e5..3a7afb0a 100644 --- a/controlplane/controllers/suite_test.go +++ b/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 diff --git a/controlplane/main.go b/controlplane/main.go index 5efdc621..2a4d7056 100644 --- a/controlplane/main.go +++ b/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 ( diff --git a/go.mod b/go.mod index 8f34690b..08a33310 100644 --- a/go.mod +++ b/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 diff --git a/hack/version.sh b/hack/version.sh index be2e1684..baffcf8a 100755 --- a/hack/version.sh +++ b/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}'" ) } diff --git a/pkg/cloudinit/cloudinit.go b/pkg/cloudinit/cloudinit.go index fe7c26da..8e4fbb3a 100644 --- a/pkg/cloudinit/cloudinit.go +++ b/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 ( diff --git a/pkg/cloudinit/controlplane_init.go b/pkg/cloudinit/controlplane_init.go index 5accc6c2..06c706a9 100644 --- a/pkg/cloudinit/controlplane_init.go +++ b/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 ( diff --git a/pkg/cloudinit/controlplane_init_test.go b/pkg/cloudinit/controlplane_init_test.go index 73240fa3..5e7a95e4 100644 --- a/pkg/cloudinit/controlplane_init_test.go +++ b/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) { diff --git a/pkg/etcd/etcd.go b/pkg/etcd/etcd.go index 2ab2cb90..58ae5315 100644 --- a/pkg/etcd/etcd.go +++ b/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. diff --git a/pkg/etcd/etcd_test.go b/pkg/etcd/etcd_test.go index deb07d9a..c71c520b 100644 --- a/pkg/etcd/etcd_test.go +++ b/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 ( diff --git a/pkg/etcd/util/util.go b/pkg/etcd/util/util.go index e25cdd04..50d2c377 100644 --- a/pkg/etcd/util/util.go +++ b/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. diff --git a/pkg/k3s/config.go b/pkg/k3s/config.go index 1119051c..63b9b04b 100644 --- a/pkg/k3s/config.go +++ b/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" diff --git a/pkg/k3s/control_plane.go b/pkg/k3s/control_plane.go index 8606cc9a..6b78646e 100644 --- a/pkg/k3s/control_plane.go +++ b/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 ( diff --git a/pkg/k3s/etcd_client_generator.go b/pkg/k3s/etcd_client_generator.go index 0f10fff9..678be76a 100644 --- a/pkg/k3s/etcd_client_generator.go +++ b/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. diff --git a/pkg/k3s/machine_collection.go b/pkg/k3s/machine_collection.go index 29d1e757..a1230fa1 100644 --- a/pkg/k3s/machine_collection.go +++ b/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. diff --git a/pkg/k3s/management_cluster.go b/pkg/k3s/management_cluster.go index c936fa90..183de4c0 100644 --- a/pkg/k3s/management_cluster.go +++ b/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. diff --git a/pkg/k3s/workload_cluster.go b/pkg/k3s/workload_cluster.go index 6f7fdd3d..de97243b 100644 --- a/pkg/k3s/workload_cluster.go +++ b/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 ( diff --git a/pkg/k3s/workload_cluster_coredns.go b/pkg/k3s/workload_cluster_coredns.go index 8cc58d4f..1d23257b 100644 --- a/pkg/k3s/workload_cluster_coredns.go +++ b/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 ( diff --git a/pkg/k3s/workload_cluster_etcd.go b/pkg/k3s/workload_cluster_etcd.go index 1f9990eb..30080035 100644 --- a/pkg/k3s/workload_cluster_etcd.go +++ b/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 { diff --git a/pkg/kubeconfig/kubeconfig.go b/pkg/kubeconfig/kubeconfig.go index 79332467..13e2835d 100644 --- a/pkg/kubeconfig/kubeconfig.go +++ b/pkg/kubeconfig/kubeconfig.go @@ -17,7 +17,7 @@ import ( "sigs.k8s.io/cluster-api/util/certs" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/cluster-api-provider-k3s/cluster-api-k3s/pkg/secret" + "github.com/k3s-io/cluster-api-k3s/pkg/secret" ) var ( diff --git a/pkg/machinefilters/machine_filters.go b/pkg/machinefilters/machine_filters.go index a582b95c..8264f32a 100644 --- a/pkg/machinefilters/machine_filters.go +++ b/pkg/machinefilters/machine_filters.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" "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" + bootstrapv1 "github.com/k3s-io/cluster-api-k3s/bootstrap/api/v1beta1" + controlplanev1 "github.com/k3s-io/cluster-api-k3s/controlplane/api/v1beta1" ) type Func func(machine *clusterv1.Machine) bool diff --git a/pkg/secret/certificates.go b/pkg/secret/certificates.go index 2bc073b0..46558281 100644 --- a/pkg/secret/certificates.go +++ b/pkg/secret/certificates.go @@ -39,7 +39,7 @@ import ( "sigs.k8s.io/cluster-api/util/certs" "sigs.k8s.io/controller-runtime/pkg/client" - 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 ( diff --git a/tilt-provider.yaml b/tilt-provider.yaml index 350356a6..33fa8560 100644 --- a/tilt-provider.yaml +++ b/tilt-provider.yaml @@ -1,7 +1,7 @@ - name: k3s-bootstrap config: context: bootstrap - image: ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/bootstrap-controller + image: ghcr.io/k3s-io/cluster-api-k3s/bootstrap-controller live_reload_deps: - main.go - api @@ -13,7 +13,7 @@ - name: k3s-control-plane config: context: controlplane - image: ghcr.io/cluster-api-provider-k3s/cluster-api-k3s/controlplane-controller + image: ghcr.io/k3s-io/cluster-api-k3s/controlplane-controller live_reload_deps: - main.go - api