Merge pull request #367 from furkatgofurov7/change-org-name

:chore: Rename CAPRKE2 org references in the codebase

.golangci.yml

@@ -55,17 +55,17 @@ linters-settings:
       - "4"
       - "3"
   goimports:
-    local-prefixes: github.com/rancher-sandbox/cluster-api-provider-rke2
+    local-prefixes: github.com/rancher/cluster-api-provider-rke2
   gci:
     custom-order: true
-    #local-prefixes: github.com/rancher-sandbox/cluster-api-provider-rke2
+    #local-prefixes: github.com/rancher/cluster-api-provider-rke2
     sections:
       - "standard"
       - "blank"
       - "dot"
       - "default"
       - "prefix(sigs.k8s.io/cluster-api)"
-      - "prefix(github.com/rancher-sandbox/cluster-api-provider-rke2)"
+      - "prefix(github.com/rancher/cluster-api-provider-rke2)"
     wsl:
       force-err-cuddling: false
 linters:

Dockerfile

@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
 
 # Production image
 FROM gcr.io/distroless/static:nonroot-${ARCH}
-LABEL org.opencontainers.image.source=https://github.com/rancher-sandbox/cluster-api-provider-rke2
+LABEL org.opencontainers.image.source=https://github.com/rancher/cluster-api-provider-rke2
 WORKDIR /
 COPY --from=builder /workspace/manager .
 # Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies

Makefile

@@ -220,7 +220,7 @@ generate-go-conversions-rke2-control-plane: $(CONVERSION_GEN) ## Generate conver
 	$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/api/v1alpha1"
 	$(CONVERSION_GEN) \
 		--input-dirs=./controlplane/api/v1alpha1 \
-		--extra-peer-dirs=github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
+		--extra-peer-dirs=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
 		--build-tag=ignore_autogenerated_rk2_control_plane \
 		--output-file-base=zz_generated.conversion $(ROOT_DIR) \
 		--go-header-file=./hack/boilerplate.go.txt
@@ -299,11 +299,11 @@ managers: $(addprefix manager-,$(ALL_MANAGERS)) ## Run all manager-* targets
 
 .PHONY: manager-rke2-bootstrap
 manager-rke2-bootstrap: ## Build the rke2 bootstrap manager binary into the ./bin folder
-	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-bootstrap-manager github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap
+	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-bootstrap-manager github.com/rancher/cluster-api-provider-rke2/bootstrap
 
 .PHONY: manager-rke2-control-plane
 manager-rke2-control-plane: ## Build the rke2 control plane manager binary into the ./bin folder
-	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-control-plane-manager github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane
+	go build -trimpath -ldflags "$(LDFLAGS)" -o $(BIN_DIR)/rke2-control-plane-manager github.com/rancher/cluster-api-provider-rke2/controlplane
 
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites:

README.md

@@ -1,6 +1,6 @@
 # Cluster API Provider RKE2
 
-![GitHub](https://img.shields.io/github/license/rancher-sandbox/cluster-api-provider-rke2)
+![GitHub](https://img.shields.io/github/license/rancher/cluster-api-provider-rke2)
 
 ------
 
@@ -71,10 +71,10 @@ With CAPI & clusterctl versions less than v1.6.0 you need a specific configurati
 ```yaml
 providers:
   - name: "rke2"
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.1.1/bootstrap-components.yaml"
+    url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.1.1/bootstrap-components.yaml"
     type: "BootstrapProvider"
   - name: "rke2"
-    url: "https://github.com/rancher-sandbox/cluster-api-provider-rke2/releases/v0.1.1/control-plane-components.yaml"
+    url: "https://github.com/rancher/cluster-api-provider-rke2/releases/v0.1.1/control-plane-components.yaml"
     type: "ControlPlaneProvider"
 ``` 
 > NOTE: Due to some issue related to how `CAPD` creates Load Balancer healthchecks, it is necessary to use a fork of `CAPD` by providing in the above configuration file the following :
@@ -260,7 +260,7 @@ These instructions are for development purposes initially and will be changed in
 
 > **Why clone into the GOPATH?** There have been historic issues with code generation tools when they are run outside the go path
 
-2. Fork the [Cluster API Provider RKE2](https://github.com/rancher-sandbox/cluster-api-provider-rke2) repo
+2. Fork the [Cluster API Provider RKE2](https://github.com/rancher/cluster-api-provider-rke2) repo
 3. Clone your new repo into the **GOPATH** (i.e. `~/go/src/github.com/yourname/cluster-api-provider-rke2`)
 4. Ensure **Tilt** and **kind** are installed
 5. Create a `tilt-settings.json` file in the root of your forked/cloned `cluster-api` directory.

bootstrap/PROJECT

@@ -6,7 +6,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: bootstrap
-repo: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap
+repo: github.com/rancher/cluster-api-provider-rke2/bootstrap
 resources:
 - api:
     crdVersion: v1
@@ -15,7 +15,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: Rke2Config
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -27,7 +27,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: Rke2ConfigTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -39,7 +39,7 @@ resources:
   domain: cluster.x-k8s.io
   group: bootstrap
   kind: RKE2ConfigTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1
+  path: github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1
   version: v1beta1
   webhooks:
     conversion: true

bootstrap/api/v1alpha1/conversion.go

@@ -23,7 +23,7 @@ import (
 
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 

bootstrap/api/v1alpha1/conversion_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 

bootstrap/api/v1alpha1/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 
 // Package v1alpha1 contains a v1alpha1 api for bootstrap resources.
 //
-// +k8s:conversion-gen=github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1
+// +k8s:conversion-gen=github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1
 // +k8s:deepcopy-gen=package
 package v1alpha1

bootstrap/internal/cloudinit/cloudinit.go

@@ -26,7 +26,7 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/yaml.v3"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 var (

bootstrap/internal/cloudinit/controlplane_init.go

@@ -19,7 +19,7 @@ package cloudinit
 import (
 	"fmt"
 
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
 )
 
 //nolint:lll

bootstrap/internal/controllers/rke2config_controller.go

@@ -42,15 +42,15 @@ import (
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/locking"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
-	bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/ignition"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/locking"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
+	bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
 )
 
 const (

bootstrap/internal/controllers/suite_test.go

@@ -30,7 +30,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to

bootstrap/internal/ignition/butane/butane.go

@@ -29,8 +29,8 @@ import (
 	ignitionTypes "github.com/coreos/ignition/v2/config/v3_3/types"
 	"github.com/pkg/errors"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 // The template contains configurations for two main sections: systemd units and storage files.

bootstrap/internal/ignition/butane/butane_test.go

@@ -27,8 +27,8 @@ import (
 
 	"k8s.io/utils/pointer"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 func TestButane(t *testing.T) {

bootstrap/internal/ignition/ignition.go

@@ -18,9 +18,9 @@ package ignition
 import (
 	"fmt"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
 )
 
 const (

bootstrap/internal/ignition/ignition_test.go

@@ -23,8 +23,8 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 )
 
 func TestIgnition(t *testing.T) {

bootstrap/main.go

@@ -41,12 +41,12 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/flags"
 
-	bootstrapv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/controllers"
-	controlplanev1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
-	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
+	bootstrapv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/controllers"
+	controlplanev1alpha1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
 )
 
 var (

controlplane/PROJECT

@@ -2,7 +2,7 @@ domain: cluster.x-k8s.io
 layout:
 - go.kubebuilder.io/v3
 projectName: controlplane
-repo: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane
+repo: github.com/rancher/cluster-api-provider-rke2/controlplane
 resources:
 - api:
     crdVersion: v1
@@ -11,7 +11,7 @@ resources:
   domain: cluster.x-k8s.io
   group: controlplane
   kind: Rke2ControlPlane
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true
@@ -23,7 +23,7 @@ resources:
   domain: cluster.x-k8s.io
   group: controlplane
   kind: Rke2ControlPlaneTemplate
-  path: github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1
+  path: github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1
   version: v1alpha1
   webhooks:
     defaulting: true

controlplane/api/v1alpha1/conversion.go

@@ -22,7 +22,7 @@ import (
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 

controlplane/api/v1alpha1/conversion_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
 
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 

controlplane/api/v1alpha1/doc.go

@@ -16,6 +16,6 @@ limitations under the License.
 
 // Package v1alpha1 contains a v1alpha1 api for controlplane resources.
 //
-// +k8s:conversion-gen=github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1
+// +k8s:conversion-gen=github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1
 // +k8s:deepcopy-gen=package
 package v1alpha1

controlplane/api/v1alpha1/rke2controlplane_types.go

@@ -23,7 +23,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1alpha1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
+	bootstrapv1alpha1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 )
 
 const (

controlplane/api/v1beta1/rke2controlplane_types.go

@@ -23,7 +23,7 @@ import (
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 const (

controlplane/api/v1beta1/rke2controlplane_webhook.go

@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // log is for logging in this package.

controlplane/api/v1beta1/rke2controlplanetemplate_webhook.go

@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1beta1"
+	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 )
 
 // SetupWebhookWithManager sets up the Controller Manager for the Webhook for the RKE2ControlPlaneTemplate resource.