Skip to content

Commit

Permalink
Merge pull request #470 from Danil-Grigorev/org-change-backport
Browse files Browse the repository at this point in the history
Backport: Change organisation name in Makefile
  • Loading branch information
furkatgofurov7 authored Oct 11, 2024
2 parents 6266091 + ff3af1c commit 974a2c0
Show file tree
Hide file tree
Showing 49 changed files with 117 additions and 117 deletions.
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/e2e_conf.yaml
export PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)

# Set --output-base for conversion-gen if we are not within GOPATH
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher-sandbox/cluster-api-provider-rke2)
ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/github.com/rancher/cluster-api-provider-rke2)
CONVERSION_GEN_OUTPUT_BASE_CAPRKE2 := --output-base=$(ROOT_DIR)/$(CAPRKE2_DIR)
CONVERSION_GEN_OUTPUT_BASE_CAPBPR := --output-base=$(ROOT_DIR)/$(CAPBPR_DIR)
else
Expand Down Expand Up @@ -113,7 +113,7 @@ TAG ?= dev
ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm arm64 ppc64le s390x
REGISTRY ?= ghcr.io
ORG ?= rancher-sandbox
ORG ?= rancher
CONTROLLER_IMAGE_NAME := cluster-api-provider-rke2
BOOTSTRAP_IMAGE_NAME := $(CONTROLLER_IMAGE_NAME)-bootstrap
CONTROLPLANE_IMAGE_NAME = $(CONTROLLER_IMAGE_NAME)-controlplane
Expand Down Expand Up @@ -271,11 +271,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:
Expand Down Expand Up @@ -466,7 +466,7 @@ release-manifests: $(RELEASE_DIR) $(KUSTOMIZE) ## Build the manifests to publish
.PHONY: release-notes
release-notes: $(RELEASE_DIR) $(GH)
if [ -n "${PRE_RELEASE}" ]; then \
echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher-sandbox/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
echo ":rotating_light: This is a RELEASE CANDIDATE. Use it only for testing purposes. If you find any bugs, file an [issue](https://github.com/rancher/cluster-api-provider-rke2/issues/new)." > $(RELEASE_DIR)/CHANGELOG.md; \
else \
$(GH) api repos/$(ORG)/$(GH_REPO_NAME)/releases/generate-notes -F tag_name=$(VERSION) -F previous_tag_name=$(PREVIOUS_VERSION) --jq '.body' > $(RELEASE_DIR)/CHANGELOG.md; \
fi
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

------

Expand Down Expand Up @@ -65,10 +65,10 @@ In order to use `clusterctl` to deploy the RKE2 Provider, you need a specific co
```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 :
Expand Down Expand Up @@ -194,7 +194,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/myname/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.
Expand All @@ -203,7 +203,7 @@ These instructions are for development purposes initially and will be changed in
```json
{
"default_registry": "ghcr.io/rancher-sandox",
"provider_repos": ["../../github.com/rancher-sandbox/cluster-api-provider-rke2"],
"provider_repos": ["../../github.com/rancher/cluster-api-provider-rke2"],
"enable_providers": ["docker", "rke2-bootstrap", "rke2-control-plane"],
"kustomize_substitutions": {
"EXP_MACHINE_POOL": "true",
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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
Expand All @@ -11,7 +11,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
Expand All @@ -23,7 +23,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
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-bootstrap:dev
- image: ghcr.io/rancher/cluster-api-provider-rke2-bootstrap:dev
name: manager
2 changes: 1 addition & 1 deletion bootstrap/internal/cloudinit/cloudinit.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/pkg/errors"
"gopkg.in/yaml.v3"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/internal/cloudinit/controlplane_init.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions bootstrap/internal/controllers/rke2config_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,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/v1alpha1"
"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/v1alpha1"
"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/v1alpha1"
"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/v1alpha1"
"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 (
Expand Down
2 changes: 1 addition & 1 deletion bootstrap/internal/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v1alpha1"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/internal/ignition/butane/butane.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
)

// The template contains configurations for two main sections: systemd units and storage files.
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/internal/ignition/butane/butane_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

"k8s.io/utils/pointer"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
)

func TestButane(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions bootstrap/internal/ignition/ignition.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package ignition
import (
"fmt"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"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/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/ignition/butane"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions bootstrap/internal/ignition/ignition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
)

func TestIgnition(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions bootstrap/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ import (

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/controllers"
controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/bootstrap/internal/controllers"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions controlplane/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/v1alpha1/rke2controlplane_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/v1alpha1/rke2controlplane_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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/v1alpha1"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
)

// log is for logging in this package.
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion controlplane/config/default/manager_image_patch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ spec:
template:
spec:
containers:
- image: ghcr.io/rancher-sandbox/cluster-api-provider-rke2-controlplane:dev
- image: ghcr.io/rancher/cluster-api-provider-rke2-controlplane:dev
name: manager
10 changes: 5 additions & 5 deletions controlplane/internal/controllers/rke2controlplane_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ import (
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/cluster-api/util/patch"

controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/kubeconfig"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/registration"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/secret"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
"github.com/rancher/cluster-api-provider-rke2/pkg/registration"
"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
"github.com/rancher/cluster-api-provider-rke2/pkg/secret"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package controllers
import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"

// "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/kubeconfig"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
// "github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
Expand Down
8 changes: 4 additions & 4 deletions controlplane/internal/controllers/scale.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ import (
"sigs.k8s.io/cluster-api/util/collections"
"sigs.k8s.io/cluster-api/util/conditions"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
rke2 "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"
bsutil "github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/util"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
rke2 "github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
bsutil "github.com/rancher/cluster-api-provider-rke2/pkg/util"
)

func (r *RKE2ControlPlaneReconciler) initializeControlPlane(
Expand Down
6 changes: 3 additions & 3 deletions controlplane/internal/controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import (
. "github.com/onsi/gomega"

// +kubebuilder:scaffold:imports
bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/test/helpers"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/test/helpers"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
)

Expand Down
8 changes: 4 additions & 4 deletions controlplane/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ import (

clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"

bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/internal/controllers"
"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1alpha1"
"github.com/rancher/cluster-api-provider-rke2/controlplane/internal/controllers"
"github.com/rancher/cluster-api-provider-rke2/pkg/consts"
)

var (
Expand Down
Loading

0 comments on commit 974a2c0

Please sign in to comment.