From 01208d646f0e53886fda37cd30ccfe0a7cd2ccfd Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Thu, 13 Aug 2020 11:18:49 -0400 Subject: [PATCH] chore: rename cluster api provider to match capi norms This PR renames our "cluster-api-provider" to "cluster-api-provider-sidero", which is the norm for other providers (including our own). It also ensures that the pod name is "caps-controller-manager" when running. Again, the norm with CAPI pods. Signed-off-by: Spencer Smith --- Dockerfile | 26 +++++++++---------- Makefile | 6 ++--- config/kustomization.yaml | 2 +- .../PROJECT | 2 +- .../api/v1alpha2/doc.go | 2 +- .../api/v1alpha2/groupversion_info.go | 0 .../api/v1alpha2/metalcluster_conversion.go | 2 +- .../api/v1alpha2/metalcluster_types.go | 0 .../api/v1alpha2/metalmachine_conversion.go | 2 +- .../api/v1alpha2/metalmachine_types.go | 0 .../metalmachinetemplate_conversion.go | 2 +- .../v1alpha2/metalmachinetemplate_types.go | 0 .../api/v1alpha2/zz_generated.conversion.go | 2 +- .../api/v1alpha2/zz_generated.deepcopy.go | 0 .../api/v1alpha3/doc.go | 0 .../api/v1alpha3/groupversion_info.go | 0 .../api/v1alpha3/metalcluster_conversion.go | 0 .../api/v1alpha3/metalcluster_types.go | 0 .../api/v1alpha3/metalcluster_webhook.go | 0 .../api/v1alpha3/metalclusterlist_webhook.go | 0 .../api/v1alpha3/metalmachine_conversion.go | 0 .../api/v1alpha3/metalmachine_types.go | 0 .../api/v1alpha3/metalmachine_webhook.go | 0 .../api/v1alpha3/metalmachinelist_webhook.go | 0 .../metalmachinetemplate_conversion.go | 0 .../v1alpha3/metalmachinetemplate_types.go | 0 .../v1alpha3/metalmachinetemplate_webhook.go | 0 .../metalmachinetemplatelist_webhook.go | 0 .../api/v1alpha3/zz_generated.deepcopy.go | 0 .../config/certmanager/certificate.yaml | 0 .../config/certmanager/kustomization.yaml | 0 .../config/certmanager/kustomizeconfig.yaml | 0 ...ucture.cluster.x-k8s.io_metalclusters.yaml | 0 ...ucture.cluster.x-k8s.io_metalmachines.yaml | 0 ...luster.x-k8s.io_metalmachinetemplates.yaml | 0 .../config/crd/kustomization.yaml | 0 .../config/crd/kustomizeconfig.yaml | 0 .../patches/cainjection_in_metalclusters.yaml | 0 .../patches/cainjection_in_metalmachines.yaml | 0 .../cainjection_in_metalmachinetemplates.yaml | 0 .../crd/patches/webhook_in_metalclusters.yaml | 0 .../crd/patches/webhook_in_metalmachines.yaml | 0 .../webhook_in_metalmachinetemplates.yaml | 0 .../config/default/kustomization.yaml | 0 .../default/manager_auth_proxy_patch.yaml | 0 .../config/kustomization.yaml | 2 +- .../config/manager/kustomization.yaml | 0 .../config/manager/manager.yaml | 0 .../config/patch_crd_webhook_namespace.yaml | 0 .../config/prometheus/kustomization.yaml | 0 .../config/prometheus/monitor.yaml | 0 .../config/rbac/auth_proxy_role.yaml | 0 .../config/rbac/auth_proxy_role_binding.yaml | 0 .../config/rbac/auth_proxy_service.yaml | 0 .../config/rbac/kustomization.yaml | 0 .../config/rbac/leader_election_role.yaml | 0 .../rbac/leader_election_role_binding.yaml | 0 .../config/rbac/metalcluster_editor_role.yaml | 0 .../config/rbac/metalcluster_viewer_role.yaml | 0 .../config/rbac/metalmachine_editor_role.yaml | 0 .../config/rbac/metalmachine_viewer_role.yaml | 0 .../metalmachinetemplate_editor_role.yaml | 0 .../metalmachinetemplate_viewer_role.yaml | 0 .../config/rbac/role.yaml | 0 .../config/rbac/role_binding.yaml | 0 .../config/webhook/kustomization.yaml | 0 .../config/webhook/kustomizeconfig.yaml | 0 .../config/webhook/manager_webhook_patch.yaml | 0 .../config/webhook/service.yaml | 0 .../webhook/webhookcainjection_patch.yaml | 0 .../controllers/metalcluster_controller.go | 2 +- .../controllers/metalmachine_controller.go | 6 ++--- .../controllers/suite_test.go | 2 +- .../internal/pkg/ipmi/ipmi.go | 0 .../main.go | 6 ++--- .../pkg/constants/constants.go | 0 76 files changed, 32 insertions(+), 32 deletions(-) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/PROJECT (97%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/doc.go (86%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/groupversion_info.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalcluster_conversion.go (99%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalcluster_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalmachine_conversion.go (99%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalmachine_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalmachinetemplate_conversion.go (98%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/metalmachinetemplate_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/zz_generated.conversion.go (99%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha2/zz_generated.deepcopy.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/doc.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/groupversion_info.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalcluster_conversion.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalcluster_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalcluster_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalclusterlist_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachine_conversion.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachine_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachine_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachinelist_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachinetemplate_conversion.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachinetemplate_types.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachinetemplate_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/metalmachinetemplatelist_webhook.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/api/v1alpha3/zz_generated.deepcopy.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/certmanager/certificate.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/certmanager/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/certmanager/kustomizeconfig.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/kustomizeconfig.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/cainjection_in_metalclusters.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/cainjection_in_metalmachines.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/cainjection_in_metalmachinetemplates.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/webhook_in_metalclusters.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/webhook_in_metalmachines.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/crd/patches/webhook_in_metalmachinetemplates.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/default/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/default/manager_auth_proxy_patch.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/kustomization.yaml (96%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/manager/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/manager/manager.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/patch_crd_webhook_namespace.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/prometheus/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/prometheus/monitor.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/auth_proxy_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/auth_proxy_role_binding.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/auth_proxy_service.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/leader_election_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/leader_election_role_binding.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalcluster_editor_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalcluster_viewer_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalmachine_editor_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalmachine_viewer_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalmachinetemplate_editor_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/metalmachinetemplate_viewer_role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/role.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/rbac/role_binding.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/webhook/kustomization.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/webhook/kustomizeconfig.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/webhook/manager_webhook_patch.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/webhook/service.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/config/webhook/webhookcainjection_patch.yaml (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/controllers/metalcluster_controller.go (98%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/controllers/metalmachine_controller.go (99%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/controllers/suite_test.go (97%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/internal/pkg/ipmi/ipmi.go (100%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/main.go (97%) rename internal/app/{cluster-api-provider => cluster-api-provider-sidero}/pkg/constants/constants.go (100%) diff --git a/Dockerfile b/Dockerfile index ed189cd5..0ff84d23 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,22 +26,22 @@ RUN ! go mod tidy -v 2>&1 | grep . FROM base AS manifests-build RUN controller-gen \ - crd:crdVersions=v1 paths="./internal/app/cluster-api-provider/api/..." output:crd:dir="./internal/app/cluster-api-provider/config/crd/bases" \ - rbac:roleName=manager-role paths="./internal/app/cluster-api-provider/controllers/..." output:rbac:dir="./internal/app/cluster-api-provider/config/rbac" \ - webhook output:webhook:dir="./internal/app/cluster-api-provider/config/webhook" + crd:crdVersions=v1 paths="./internal/app/cluster-api-provider-sidero/api/..." output:crd:dir="./internal/app/cluster-api-provider-sidero/config/crd/bases" \ + rbac:roleName=manager-role paths="./internal/app/cluster-api-provider-sidero/controllers/..." output:rbac:dir="./internal/app/cluster-api-provider-sidero/config/rbac" \ + webhook output:webhook:dir="./internal/app/cluster-api-provider-sidero/config/webhook" RUN controller-gen \ crd:crdVersions=v1 paths="./internal/app/metal-controller-manager/api/..." output:crd:dir="./internal/app/metal-controller-manager/config/crd/bases" \ rbac:roleName=manager-role paths="./internal/app/metal-controller-manager/controllers/..." output:rbac:dir="./internal/app/metal-controller-manager/config/rbac" \ webhook output:webhook:dir="./internal/app/metal-controller-manager/config/webhook" FROM scratch AS manifests -COPY --from=manifests-build /src/internal/app/cluster-api-provider/config ./internal/app/cluster-api-provider/config +COPY --from=manifests-build /src/internal/app/cluster-api-provider-sidero/config ./internal/app/cluster-api-provider-sidero/config COPY --from=manifests-build /src/internal/app/metal-controller-manager/config ./internal/app/metal-controller-manager/config FROM base AS generate-build RUN controller-gen object:headerFile="./hack/boilerplate.go.txt" paths="./..." -RUN conversion-gen --input-dirs="./internal/app/cluster-api-provider/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt" +RUN conversion-gen --input-dirs="./internal/app/cluster-api-provider-sidero/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt" FROM scratch AS generate -COPY --from=generate-build /src/internal/app/cluster-api-provider/api ./internal/app/cluster-api-provider/api +COPY --from=generate-build /src/internal/app/cluster-api-provider-sidero/api ./internal/app/cluster-api-provider-sidero/api COPY --from=generate-build /src/internal/app/metal-controller-manager/api ./internal/app/metal-controller-manager/api FROM k8s.gcr.io/hyperkube:v1.17.0 AS release-build @@ -51,13 +51,13 @@ RUN apt update -y \ && tar -xf kustomize_v3.5.4_linux_amd64.tar.gz -C /usr/local/bin \ && rm kustomize_v3.5.4_linux_amd64.tar.gz COPY ./config ./config -COPY ./internal/app/cluster-api-provider/config ./internal/app/cluster-api-provider/config +COPY ./internal/app/cluster-api-provider-sidero/config ./internal/app/cluster-api-provider-sidero/config COPY ./internal/app/metal-controller-manager/config ./internal/app/metal-controller-manager/config COPY ./internal/app/metal-metadata-server/config ./internal/app/metal-metadata-server/config ARG REGISTRY_AND_USERNAME ARG TAG -RUN cd ./internal/app/cluster-api-provider/config/manager \ - && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/cluster-api-provider:${TAG} +RUN cd ./internal/app/cluster-api-provider-sidero/config/manager \ + && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/cluster-api-provider-sidero:${TAG} RUN cd ./internal/app/metal-controller-manager/config/manager \ && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/metal-controller-manager:${TAG} RUN cd ./internal/app/metal-metadata-server/config/server \ @@ -70,18 +70,18 @@ ARG TAG COPY --from=release-build /infrastructure-components.yaml /infrastructure-sidero/${TAG}/components.yaml COPY --from=release-build /metadata.yaml /infrastructure-sidero/${TAG}/metadata.yaml -FROM base AS build-cluster-api-provider -RUN --mount=type=cache,target=/root/.cache/go-build GOOS=linux go build -ldflags "-s -w" -o /manager ./internal/app/cluster-api-provider +FROM base AS build-cluster-api-provider-sidero +RUN --mount=type=cache,target=/root/.cache/go-build GOOS=linux go build -ldflags "-s -w" -o /manager ./internal/app/cluster-api-provider-sidero RUN chmod +x /manager ## TODO(rsmitty): make bmc pkg and move to autonomy image -FROM scratch AS cluster-api-provider +FROM scratch AS cluster-api-provider-sidero COPY --from=docker.io/autonomy/ca-certificates:ffdacf0 / / COPY --from=docker.io/autonomy/fhs:ffdacf0 / / COPY --from=docker.io/autonomy/musl:ffdacf0 / / COPY --from=docker.io/autonomy/libressl:ffdacf0 / / COPY --from=docker.io/autonomy/ipmitool:ffdacf0 / / -COPY --from=build-cluster-api-provider /manager /manager +COPY --from=build-cluster-api-provider-sidero /manager /manager ENTRYPOINT [ "/manager" ] FROM base AS build-metal-controller-manager diff --git a/Makefile b/Makefile index 59d2c50e..b71ffeeb 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ COMMON_ARGS += --build-arg=TAG=$(TAG) COMMON_ARGS += --build-arg=MODULE=$(MODULE) COMMON_ARGS += --build-arg=PKGS=$(PKGS) -all: manifests generate cluster-api-provider metal-controller-manager metal-metadata-server +all: manifests generate cluster-api-provider-sidero metal-controller-manager metal-metadata-server # Help Menu @@ -94,8 +94,8 @@ manifests: ## Generate manifests (e.g. CRD, RBAC, etc.). release: manifests ## Create the release YAML. The build result will be ouput to the specified local destination. @$(MAKE) local-$@ DEST=./$(ARTIFACTS) -.PHONY: cluster-api-provider -cluster-api-provider: ## Build the CAPI provider container image. +.PHONY: cluster-api-provider-sidero +cluster-api-provider-sidero: ## Build the CAPI provider container image. @$(MAKE) docker-$@ TARGET_ARGS="--push=$(PUSH)" NAME="$@" ..PHONY: metal-controller-manager diff --git a/config/kustomization.yaml b/config/kustomization.yaml index 19e478ac..c4c24cf6 100644 --- a/config/kustomization.yaml +++ b/config/kustomization.yaml @@ -2,7 +2,7 @@ resources: - namespace.yaml bases: - - ../internal/app/cluster-api-provider/config + - ../internal/app/cluster-api-provider-sidero/config - ../internal/app/metal-controller-manager/config - ../internal/app/metal-metadata-server/config diff --git a/internal/app/cluster-api-provider/PROJECT b/internal/app/cluster-api-provider-sidero/PROJECT similarity index 97% rename from internal/app/cluster-api-provider/PROJECT rename to internal/app/cluster-api-provider-sidero/PROJECT index 6e8a1aa0..f6a6eeec 100644 --- a/internal/app/cluster-api-provider/PROJECT +++ b/internal/app/cluster-api-provider-sidero/PROJECT @@ -1,5 +1,5 @@ domain: cluster.x-k8s.io -repo: github.com/talos-systems/sidero/internal/app/cluster-api-provider +repo: github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero resources: - group: infrastructure kind: MetalCluster diff --git a/internal/app/cluster-api-provider/api/v1alpha2/doc.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/doc.go similarity index 86% rename from internal/app/cluster-api-provider/api/v1alpha2/doc.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/doc.go index e344205e..bcf7b9d0 100644 --- a/internal/app/cluster-api-provider/api/v1alpha2/doc.go +++ b/internal/app/cluster-api-provider-sidero/api/v1alpha2/doc.go @@ -4,4 +4,4 @@ package v1alpha2 -// +k8s:conversion-gen=github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3 +// +k8s:conversion-gen=github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3 diff --git a/internal/app/cluster-api-provider/api/v1alpha2/groupversion_info.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha2/groupversion_info.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/groupversion_info.go diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalcluster_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go similarity index 99% rename from internal/app/cluster-api-provider/api/v1alpha2/metalcluster_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go index 248f82a5..32ba60c8 100644 --- a/internal/app/cluster-api-provider/api/v1alpha2/metalcluster_conversion.go +++ b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_conversion.go @@ -12,7 +12,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" ) // ConvertTo converts this MetalCluster to the Hub version (v1alpha3). diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalcluster_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha2/metalcluster_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalcluster_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalmachine_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go similarity index 99% rename from internal/app/cluster-api-provider/api/v1alpha2/metalmachine_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go index 4993b499..b3bbdb0f 100644 --- a/internal/app/cluster-api-provider/api/v1alpha2/metalmachine_conversion.go +++ b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_conversion.go @@ -10,7 +10,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" ) // ConvertTo converts this MetalMachine to the Hub version (v1alpha3). diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalmachine_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha2/metalmachine_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachine_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalmachinetemplate_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go similarity index 98% rename from internal/app/cluster-api-provider/api/v1alpha2/metalmachinetemplate_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go index 9fa1dd4f..ecc53e63 100644 --- a/internal/app/cluster-api-provider/api/v1alpha2/metalmachinetemplate_conversion.go +++ b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_conversion.go @@ -9,7 +9,7 @@ import ( utilconversion "sigs.k8s.io/cluster-api/util/conversion" "sigs.k8s.io/controller-runtime/pkg/conversion" - infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" + infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" ) // ConvertTo converts this MetalMachineTemplate to the Hub version (v1alpha3). diff --git a/internal/app/cluster-api-provider/api/v1alpha2/metalmachinetemplate_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha2/metalmachinetemplate_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/metalmachinetemplate_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha2/zz_generated.conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go similarity index 99% rename from internal/app/cluster-api-provider/api/v1alpha2/zz_generated.conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go index 0906ae90..4d4f5cc8 100644 --- a/internal/app/cluster-api-provider/api/v1alpha2/zz_generated.conversion.go +++ b/internal/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.conversion.go @@ -15,7 +15,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" + v1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" ) func init() { diff --git a/internal/app/cluster-api-provider/api/v1alpha2/zz_generated.deepcopy.go b/internal/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.deepcopy.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha2/zz_generated.deepcopy.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha2/zz_generated.deepcopy.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/doc.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/doc.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/doc.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/doc.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/groupversion_info.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/groupversion_info.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/groupversion_info.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalcluster_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_conversion.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalcluster_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_conversion.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalcluster_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalcluster_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalcluster_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalcluster_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalcluster_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalclusterlist_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalclusterlist_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalclusterlist_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalclusterlist_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachine_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_conversion.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachine_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_conversion.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachine_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachine_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachine_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachine_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachine_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachinelist_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinelist_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachinelist_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinelist_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_conversion.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_conversion.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_conversion.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_conversion.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_types.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_types.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_types.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_types.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplate_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplate_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplatelist_webhook.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplatelist_webhook.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/metalmachinetemplatelist_webhook.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/metalmachinetemplatelist_webhook.go diff --git a/internal/app/cluster-api-provider/api/v1alpha3/zz_generated.deepcopy.go b/internal/app/cluster-api-provider-sidero/api/v1alpha3/zz_generated.deepcopy.go similarity index 100% rename from internal/app/cluster-api-provider/api/v1alpha3/zz_generated.deepcopy.go rename to internal/app/cluster-api-provider-sidero/api/v1alpha3/zz_generated.deepcopy.go diff --git a/internal/app/cluster-api-provider/config/certmanager/certificate.yaml b/internal/app/cluster-api-provider-sidero/config/certmanager/certificate.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/certmanager/certificate.yaml rename to internal/app/cluster-api-provider-sidero/config/certmanager/certificate.yaml diff --git a/internal/app/cluster-api-provider/config/certmanager/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/certmanager/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/certmanager/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/certmanager/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/certmanager/kustomizeconfig.yaml b/internal/app/cluster-api-provider-sidero/config/certmanager/kustomizeconfig.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/certmanager/kustomizeconfig.yaml rename to internal/app/cluster-api-provider-sidero/config/certmanager/kustomizeconfig.yaml diff --git a/internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml b/internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalclusters.yaml diff --git a/internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml b/internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachines.yaml diff --git a/internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml b/internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/bases/infrastructure.cluster.x-k8s.io_metalmachinetemplates.yaml diff --git a/internal/app/cluster-api-provider/config/crd/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/crd/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/crd/kustomizeconfig.yaml b/internal/app/cluster-api-provider-sidero/config/crd/kustomizeconfig.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/kustomizeconfig.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/kustomizeconfig.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalclusters.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalclusters.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalclusters.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalclusters.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalmachines.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachines.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalmachines.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachines.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalmachinetemplates.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachinetemplates.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/cainjection_in_metalmachinetemplates.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/cainjection_in_metalmachinetemplates.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalclusters.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalclusters.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalclusters.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalclusters.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalmachines.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachines.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalmachines.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachines.yaml diff --git a/internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalmachinetemplates.yaml b/internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachinetemplates.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/crd/patches/webhook_in_metalmachinetemplates.yaml rename to internal/app/cluster-api-provider-sidero/config/crd/patches/webhook_in_metalmachinetemplates.yaml diff --git a/internal/app/cluster-api-provider/config/default/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/default/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/default/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/default/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/default/manager_auth_proxy_patch.yaml b/internal/app/cluster-api-provider-sidero/config/default/manager_auth_proxy_patch.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/default/manager_auth_proxy_patch.yaml rename to internal/app/cluster-api-provider-sidero/config/default/manager_auth_proxy_patch.yaml diff --git a/internal/app/cluster-api-provider/config/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/kustomization.yaml similarity index 96% rename from internal/app/cluster-api-provider/config/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/kustomization.yaml index d5821faf..7d1b5ecd 100644 --- a/internal/app/cluster-api-provider/config/kustomization.yaml +++ b/internal/app/cluster-api-provider-sidero/config/kustomization.yaml @@ -4,7 +4,7 @@ bases: - webhook - default -namePrefix: sidero-provider- +namePrefix: caps- patchesJson6902: - target: diff --git a/internal/app/cluster-api-provider/config/manager/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/manager/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/manager/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/manager/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/manager/manager.yaml b/internal/app/cluster-api-provider-sidero/config/manager/manager.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/manager/manager.yaml rename to internal/app/cluster-api-provider-sidero/config/manager/manager.yaml diff --git a/internal/app/cluster-api-provider/config/patch_crd_webhook_namespace.yaml b/internal/app/cluster-api-provider-sidero/config/patch_crd_webhook_namespace.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/patch_crd_webhook_namespace.yaml rename to internal/app/cluster-api-provider-sidero/config/patch_crd_webhook_namespace.yaml diff --git a/internal/app/cluster-api-provider/config/prometheus/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/prometheus/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/prometheus/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/prometheus/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/prometheus/monitor.yaml b/internal/app/cluster-api-provider-sidero/config/prometheus/monitor.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/prometheus/monitor.yaml rename to internal/app/cluster-api-provider-sidero/config/prometheus/monitor.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/auth_proxy_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/auth_proxy_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/auth_proxy_role_binding.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role_binding.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/auth_proxy_role_binding.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_role_binding.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/auth_proxy_service.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_service.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/auth_proxy_service.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/auth_proxy_service.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/leader_election_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/leader_election_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/leader_election_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/leader_election_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/leader_election_role_binding.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/leader_election_role_binding.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/leader_election_role_binding.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/leader_election_role_binding.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalcluster_editor_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalcluster_editor_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalcluster_editor_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalcluster_editor_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalcluster_viewer_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalcluster_viewer_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalcluster_viewer_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalcluster_viewer_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalmachine_editor_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalmachine_editor_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalmachine_editor_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalmachine_editor_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalmachine_viewer_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalmachine_viewer_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalmachine_viewer_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalmachine_viewer_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalmachinetemplate_editor_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_editor_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalmachinetemplate_editor_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_editor_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/metalmachinetemplate_viewer_role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_viewer_role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/metalmachinetemplate_viewer_role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/metalmachinetemplate_viewer_role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/role.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/role.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/role.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/role.yaml diff --git a/internal/app/cluster-api-provider/config/rbac/role_binding.yaml b/internal/app/cluster-api-provider-sidero/config/rbac/role_binding.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/rbac/role_binding.yaml rename to internal/app/cluster-api-provider-sidero/config/rbac/role_binding.yaml diff --git a/internal/app/cluster-api-provider/config/webhook/kustomization.yaml b/internal/app/cluster-api-provider-sidero/config/webhook/kustomization.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/webhook/kustomization.yaml rename to internal/app/cluster-api-provider-sidero/config/webhook/kustomization.yaml diff --git a/internal/app/cluster-api-provider/config/webhook/kustomizeconfig.yaml b/internal/app/cluster-api-provider-sidero/config/webhook/kustomizeconfig.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/webhook/kustomizeconfig.yaml rename to internal/app/cluster-api-provider-sidero/config/webhook/kustomizeconfig.yaml diff --git a/internal/app/cluster-api-provider/config/webhook/manager_webhook_patch.yaml b/internal/app/cluster-api-provider-sidero/config/webhook/manager_webhook_patch.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/webhook/manager_webhook_patch.yaml rename to internal/app/cluster-api-provider-sidero/config/webhook/manager_webhook_patch.yaml diff --git a/internal/app/cluster-api-provider/config/webhook/service.yaml b/internal/app/cluster-api-provider-sidero/config/webhook/service.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/webhook/service.yaml rename to internal/app/cluster-api-provider-sidero/config/webhook/service.yaml diff --git a/internal/app/cluster-api-provider/config/webhook/webhookcainjection_patch.yaml b/internal/app/cluster-api-provider-sidero/config/webhook/webhookcainjection_patch.yaml similarity index 100% rename from internal/app/cluster-api-provider/config/webhook/webhookcainjection_patch.yaml rename to internal/app/cluster-api-provider-sidero/config/webhook/webhookcainjection_patch.yaml diff --git a/internal/app/cluster-api-provider/controllers/metalcluster_controller.go b/internal/app/cluster-api-provider-sidero/controllers/metalcluster_controller.go similarity index 98% rename from internal/app/cluster-api-provider/controllers/metalcluster_controller.go rename to internal/app/cluster-api-provider-sidero/controllers/metalcluster_controller.go index f2c511e0..21f53b93 100644 --- a/internal/app/cluster-api-provider/controllers/metalcluster_controller.go +++ b/internal/app/cluster-api-provider-sidero/controllers/metalcluster_controller.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - infrav1 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" + infrav1 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" ) // MetalClusterReconciler reconciles a MetalCluster object. diff --git a/internal/app/cluster-api-provider/controllers/metalmachine_controller.go b/internal/app/cluster-api-provider-sidero/controllers/metalmachine_controller.go similarity index 99% rename from internal/app/cluster-api-provider/controllers/metalmachine_controller.go rename to internal/app/cluster-api-provider-sidero/controllers/metalmachine_controller.go index e38dd124..359f8544 100644 --- a/internal/app/cluster-api-provider/controllers/metalmachine_controller.go +++ b/internal/app/cluster-api-provider-sidero/controllers/metalmachine_controller.go @@ -26,9 +26,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - infrav1 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" - "github.com/talos-systems/sidero/internal/app/cluster-api-provider/internal/pkg/ipmi" - "github.com/talos-systems/sidero/internal/app/cluster-api-provider/pkg/constants" + infrav1 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" + "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/internal/pkg/ipmi" + "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/pkg/constants" metalv1alpha1 "github.com/talos-systems/sidero/internal/app/metal-controller-manager/api/v1alpha1" ) diff --git a/internal/app/cluster-api-provider/controllers/suite_test.go b/internal/app/cluster-api-provider-sidero/controllers/suite_test.go similarity index 97% rename from internal/app/cluster-api-provider/controllers/suite_test.go rename to internal/app/cluster-api-provider-sidero/controllers/suite_test.go index 7a5f925d..3d4189e7 100644 --- a/internal/app/cluster-api-provider/controllers/suite_test.go +++ b/internal/app/cluster-api-provider-sidero/controllers/suite_test.go @@ -19,7 +19,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - infrastructurev1alpha2 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha2" + infrastructurev1alpha2 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha2" // +kubebuilder:scaffold:imports ) diff --git a/internal/app/cluster-api-provider/internal/pkg/ipmi/ipmi.go b/internal/app/cluster-api-provider-sidero/internal/pkg/ipmi/ipmi.go similarity index 100% rename from internal/app/cluster-api-provider/internal/pkg/ipmi/ipmi.go rename to internal/app/cluster-api-provider-sidero/internal/pkg/ipmi/ipmi.go diff --git a/internal/app/cluster-api-provider/main.go b/internal/app/cluster-api-provider-sidero/main.go similarity index 97% rename from internal/app/cluster-api-provider/main.go rename to internal/app/cluster-api-provider-sidero/main.go index 67feff69..2637f694 100644 --- a/internal/app/cluster-api-provider/main.go +++ b/internal/app/cluster-api-provider-sidero/main.go @@ -16,9 +16,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/log/zap" - infrav1alpha2 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha2" - infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider/api/v1alpha3" - "github.com/talos-systems/sidero/internal/app/cluster-api-provider/controllers" + infrav1alpha2 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha2" + infrav1alpha3 "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/api/v1alpha3" + "github.com/talos-systems/sidero/internal/app/cluster-api-provider-sidero/controllers" metalv1alpha1 "github.com/talos-systems/sidero/internal/app/metal-controller-manager/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/internal/app/cluster-api-provider/pkg/constants/constants.go b/internal/app/cluster-api-provider-sidero/pkg/constants/constants.go similarity index 100% rename from internal/app/cluster-api-provider/pkg/constants/constants.go rename to internal/app/cluster-api-provider-sidero/pkg/constants/constants.go