feat: update paths of apps

This PR updates the naming of the two apps that make up sidero for consistency. It also updates things like the Makefile, Dockerfile, and kustomize to make sure image names are the same as these app names. Signed-off-by: Spencer Smith <[email protected]>
siderolabs · May 26, 2021 · 6821dd2 · 6821dd2
1 parent 5bfcb9d
commit 6821dd2
Show file tree

Hide file tree

Showing 172 changed files with 135 additions and 123 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -53,47 +53,47 @@ RUN --mount=type=cache,target=/.cache ! go mod tidy -v 2>&1 | grep .
 
 FROM base AS manifests-build
 RUN --mount=type=cache,target=/.cache controller-gen \
-  crd:crdVersions=v1 paths="./app/cluster-api-provider-sidero/api/..." output:crd:dir="./app/cluster-api-provider-sidero/config/crd/bases" \
-  rbac:roleName=manager-role paths="./app/cluster-api-provider-sidero/controllers/..." output:rbac:dir="./app/cluster-api-provider-sidero/config/rbac" \
-  webhook output:webhook:dir="./app/cluster-api-provider-sidero/config/webhook"
+  crd:crdVersions=v1 paths="./app/caps-controller-manager/api/..." output:crd:dir="./app/caps-controller-manager/config/crd/bases" \
+  rbac:roleName=manager-role paths="./app/caps-controller-manager/controllers/..." output:rbac:dir="./app/caps-controller-manager/config/rbac" \
+  webhook output:webhook:dir="./app/caps-controller-manager/config/webhook"
 RUN --mount=type=cache,target=/.cache controller-gen \
-  crd:crdVersions=v1 paths="./app/metal-controller-manager/api/..." output:crd:dir="./app/metal-controller-manager/config/crd/bases" \
-  rbac:roleName=manager-role paths="./app/metal-controller-manager/controllers/..." output:rbac:dir="./app/metal-controller-manager/config/rbac" \
-  webhook output:webhook:dir="./app/metal-controller-manager/config/webhook"
+  crd:crdVersions=v1 paths="./app/sidero-controller-manager/api/..." output:crd:dir="./app/sidero-controller-manager/config/crd/bases" \
+  rbac:roleName=manager-role paths="./app/sidero-controller-manager/controllers/..." output:rbac:dir="./app/sidero-controller-manager/config/rbac" \
+  webhook output:webhook:dir="./app/sidero-controller-manager/config/webhook"
 
 FROM scratch AS manifests
-COPY --from=manifests-build /src/app/cluster-api-provider-sidero/config ./app/cluster-api-provider-sidero/config
-COPY --from=manifests-build /src/app/metal-controller-manager/config ./app/metal-controller-manager/config
+COPY --from=manifests-build /src/app/caps-controller-manager/config ./app/caps-controller-manager/config
+COPY --from=manifests-build /src/app/sidero-controller-manager/config ./app/sidero-controller-manager/config
 
 FROM base AS generate-build
-COPY ./app/metal-controller-manager/internal/api/api.proto \
-  /src/app/metal-controller-manager/internal/api/api.proto
-RUN protoc -I/src/app/metal-controller-manager/internal/api \
-  --go_out=paths=source_relative:/src/app/metal-controller-manager/internal/api --go-grpc_out=paths=source_relative:/src/app/metal-controller-manager/internal/api \
+COPY ./app/sidero-controller-manager/internal/api/api.proto \
+  /src/app/sidero-controller-manager/internal/api/api.proto
+RUN protoc -I/src/app/sidero-controller-manager/internal/api \
+  --go_out=paths=source_relative:/src/app/sidero-controller-manager/internal/api --go-grpc_out=paths=source_relative:/src/app/sidero-controller-manager/internal/api \
   api.proto
 RUN --mount=type=cache,target=/.cache controller-gen object:headerFile="./hack/boilerplate.go.txt" paths="./..."
-RUN --mount=type=cache,target=/.cache conversion-gen --input-dirs="./app/cluster-api-provider-sidero/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt"
+RUN --mount=type=cache,target=/.cache conversion-gen --input-dirs="./app/caps-controller-manager/api/v1alpha2" --output-base ./ --output-file-base="zz_generated.conversion" --go-header-file="./hack/boilerplate.go.txt"
 ARG MODULE
 RUN --mount=type=cache,target=/.cache gofumports -w -local ${MODULE} .
 
 FROM scratch AS generate
-COPY --from=generate-build /src/app/cluster-api-provider-sidero/api ./app/cluster-api-provider-sidero/api
-COPY --from=generate-build /src/app/metal-controller-manager/api ./app/metal-controller-manager/api
-COPY --from=generate-build /src/app/metal-controller-manager/internal/api ./app/metal-controller-manager/internal/api
+COPY --from=generate-build /src/app/caps-controller-manager/api ./app/caps-controller-manager/api
+COPY --from=generate-build /src/app/sidero-controller-manager/api ./app/sidero-controller-manager/api
+COPY --from=generate-build /src/app/sidero-controller-manager/internal/api ./app/sidero-controller-manager/internal/api
 
 FROM --platform=${BUILDPLATFORM} alpine:3.13 AS release-build
 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.1.0/kustomize_v4.1.0_linux_amd64.tar.gz .
 RUN  tar -xf kustomize_v4.1.0_linux_amd64.tar.gz -C /usr/local/bin && rm kustomize_v4.1.0_linux_amd64.tar.gz
 COPY ./config ./config
 COPY ./templates ./templates
-COPY ./app/cluster-api-provider-sidero/config ./app/cluster-api-provider-sidero/config
-COPY ./app/metal-controller-manager/config ./app/metal-controller-manager/config
+COPY ./app/caps-controller-manager/config ./app/caps-controller-manager/config
+COPY ./app/sidero-controller-manager/config ./app/sidero-controller-manager/config
 ARG REGISTRY_AND_USERNAME
 ARG TAG
-RUN cd ./app/cluster-api-provider-sidero/config/manager \
-  && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/cluster-api-provider-sidero:${TAG}
-RUN cd ./app/metal-controller-manager/config/manager \
-  && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/metal-controller-manager:${TAG}
+RUN cd ./app/caps-controller-manager/config/manager \
+  && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/caps-controller-manager:${TAG}
+RUN cd ./app/sidero-controller-manager/config/manager \
+  && kustomize edit set image controller=${REGISTRY_AND_USERNAME}/sidero-controller-manager:${TAG}
 RUN kustomize build config > /infrastructure-components.yaml \
   && cp ./config/metadata/metadata.yaml /metadata.yaml \
   && cp ./templates/cluster-template.yaml /cluster-template.yaml
@@ -104,42 +104,42 @@ COPY --from=release-build /infrastructure-components.yaml /infrastructure-sidero
 COPY --from=release-build /metadata.yaml /infrastructure-sidero/${TAG}/metadata.yaml
 COPY --from=release-build /cluster-template.yaml /infrastructure-sidero/${TAG}/cluster-template.yaml
 
-FROM base AS build-cluster-api-provider-sidero
+FROM base AS build-caps-controller-manager
 ARG TARGETARCH
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
-RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /manager ./app/cluster-api-provider-sidero
+RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /manager ./app/caps-controller-manager
 RUN chmod +x /manager
 
 ## TODO(rsmitty): make bmc pkg and move to talos-systems image
-FROM scratch AS cluster-api-provider-sidero
+FROM scratch AS caps-controller-manager
 COPY --from=pkg-ca-certificates / /
 COPY --from=pkg-fhs / /
 COPY --from=pkg-musl / /
 COPY --from=pkg-libressl / /
 COPY --from=pkg-ipmitool / /
-COPY --from=build-cluster-api-provider-sidero /manager /manager
+COPY --from=build-caps-controller-manager /manager /manager
 LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero
 ENTRYPOINT [ "/manager" ]
 
-FROM base AS build-metal-controller-manager
+FROM base AS build-sidero-controller-manager
 ARG TALOS_RELEASE
 ARG TARGETARCH
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
-RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X main.TalosRelease=${TALOS_RELEASE}" -o /manager ./app/metal-controller-manager
+RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS} -X main.TalosRelease=${TALOS_RELEASE}" -o /manager ./app/sidero-controller-manager
 RUN chmod +x /manager
 
 FROM base AS agent-build-amd64
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
-RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/metal-controller-manager/cmd/agent
+RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=amd64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/sidero-controller-manager/cmd/agent
 RUN chmod +x /agent
 
 FROM base AS agent-build-arm64
 ARG GO_BUILDFLAGS
 ARG GO_LDFLAGS
-RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/metal-controller-manager/cmd/agent
+RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=arm64 go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /agent ./app/sidero-controller-manager/cmd/agent
 RUN chmod +x /agent
 
 FROM base AS initramfs-archive-amd64
@@ -164,7 +164,7 @@ COPY --from=pkg-linux-firmware-arm64 /lib/firmware/bnx2 ./lib/firmware/bnx2
 COPY --from=pkg-linux-firmware-arm64 /lib/firmware/bnx2x ./lib/firmware/bnx2x
 RUN set -o pipefail && find . 2>/dev/null | cpio -H newc -o | xz -v -C crc32 -0 -e -T 0 -z >/initramfs.xz
 
-FROM scratch AS metal-controller-manager-image
+FROM scratch AS sidero-controller-manager-image
 COPY --from=pkg-ca-certificates / /
 COPY --from=pkg-fhs / /
 COPY --from=pkg-musl / /
@@ -178,9 +178,9 @@ COPY --from=initramfs-archive-amd64 /initramfs.xz /var/lib/sidero/env/agent-amd6
 COPY --from=initramfs-archive-arm64 /initramfs.xz /var/lib/sidero/env/agent-arm64/initramfs.xz
 COPY --from=pkg-kernel-amd64 /boot/vmlinuz /var/lib/sidero/env/agent-amd64/vmlinuz
 COPY --from=pkg-kernel-arm64 /boot/vmlinuz /var/lib/sidero/env/agent-arm64/vmlinuz
-COPY --from=build-metal-controller-manager /manager /manager
+COPY --from=build-sidero-controller-manager /manager /manager
 
-FROM metal-controller-manager-image AS metal-controller-manager
+FROM sidero-controller-manager-image AS sidero-controller-manager
 LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero
 ENTRYPOINT [ "/manager" ]
 

diff --git a/Makefile b/Makefile
@@ -53,7 +53,7 @@ COMMON_ARGS += --build-arg=CGO_ENABLED=$(CGO_ENABLED)
 COMMON_ARGS += --build-arg=GO_BUILDFLAGS="$(GO_BUILDFLAGS)"
 COMMON_ARGS += --build-arg=GO_LDFLAGS="$(GO_LDFLAGS)"
 
-all: manifests generate cluster-api-provider-sidero metal-controller-manager sfyra
+all: manifests generate caps-controller-manager sidero-controller-manager sfyra
 
 
 # Help Menu
@@ -128,12 +128,12 @@ check-dirty: ## Verifies that source tree is not dirty
 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-sidero
-cluster-api-provider-sidero: ## Build the CAPI provider container image.
+.PHONY: caps-controller-manager
+caps-controller-manager: ## Build the CAPI provider container image.
 	@$(MAKE) docker-$@ TARGET_ARGS="--push=$(PUSH)" NAME="$@"
 
-.PHONY: metal-controller-manager
-metal-controller-manager: ## Build the CAPI provider container image.
+.PHONY: sidero-controller-manager
+sidero-controller-manager: ## Build the CAPI provider container image.
 	@$(MAKE) docker-$@ TARGET_ARGS="--push=$(PUSH)" NAME="$@"
 
 .PHONY: release-notes

diff --git a/app/cluster-api-provider-sidero/PROJECT → app/caps-controller-manager/PROJECT b/app/cluster-api-provider-sidero/PROJECT → app/caps-controller-manager/PROJECT
@@ -1,5 +1,5 @@
 domain: cluster.x-k8s.io
-repo: github.com/talos-systems/sidero/app/cluster-api-provider-sidero
+repo: github.com/talos-systems/sidero/app/caps-controller-manager
 resources:
 - group: infrastructure
   kind: MetalCluster

diff --git a/...r-api-provider-sidero/api/v1alpha2/doc.go → ...ps-controller-manager/api/v1alpha2/doc.go b/...r-api-provider-sidero/api/v1alpha2/doc.go → ...ps-controller-manager/api/v1alpha2/doc.go
@@ -4,4 +4,4 @@
 
 package v1alpha2
 
-// +k8s:conversion-gen=github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3
+// +k8s:conversion-gen=github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3
diff --git a/...-sidero/api/v1alpha2/groupversion_info.go → ...manager/api/v1alpha2/groupversion_info.go b/...-sidero/api/v1alpha2/groupversion_info.go → ...manager/api/v1alpha2/groupversion_info.go
diff --git a/...o/api/v1alpha2/metalcluster_conversion.go → ...r/api/v1alpha2/metalcluster_conversion.go b/...o/api/v1alpha2/metalcluster_conversion.go → ...r/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/app/cluster-api-provider-sidero/api/v1alpha3"
+	infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
 )
 
 // ConvertTo converts this MetalCluster to the Hub version (v1alpha3).

diff --git a/...sidero/api/v1alpha2/metalcluster_types.go → ...anager/api/v1alpha2/metalcluster_types.go b/...sidero/api/v1alpha2/metalcluster_types.go → ...anager/api/v1alpha2/metalcluster_types.go
diff --git a/...o/api/v1alpha2/metalmachine_conversion.go → ...r/api/v1alpha2/metalmachine_conversion.go b/...o/api/v1alpha2/metalmachine_conversion.go → ...r/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/app/cluster-api-provider-sidero/api/v1alpha3"
+	infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
 )
 
 // ConvertTo converts this MetalMachine to the Hub version (v1alpha3).

diff --git a/...sidero/api/v1alpha2/metalmachine_types.go → ...anager/api/v1alpha2/metalmachine_types.go b/...sidero/api/v1alpha2/metalmachine_types.go → ...anager/api/v1alpha2/metalmachine_types.go
diff --git a/...alpha2/metalmachinetemplate_conversion.go → ...alpha2/metalmachinetemplate_conversion.go b/...alpha2/metalmachinetemplate_conversion.go → ...alpha2/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/app/cluster-api-provider-sidero/api/v1alpha3"
+	infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
 )
 
 // ConvertTo converts this MetalMachineTemplate to the Hub version (v1alpha3).

diff --git a/...pi/v1alpha2/metalmachinetemplate_types.go → ...pi/v1alpha2/metalmachinetemplate_types.go b/...pi/v1alpha2/metalmachinetemplate_types.go → ...pi/v1alpha2/metalmachinetemplate_types.go
diff --git a/...ider-sidero/api/v1alpha2/v1alpha2_test.go → ...ler-manager/api/v1alpha2/v1alpha2_test.go b/...ider-sidero/api/v1alpha2/v1alpha2_test.go → ...ler-manager/api/v1alpha2/v1alpha2_test.go
diff --git a/...o/api/v1alpha2/zz_generated.conversion.go → ...r/api/v1alpha2/zz_generated.conversion.go b/...o/api/v1alpha2/zz_generated.conversion.go → ...r/api/v1alpha2/zz_generated.conversion.go
diff --git a/...ero/api/v1alpha2/zz_generated.deepcopy.go → ...ger/api/v1alpha2/zz_generated.deepcopy.go b/...ero/api/v1alpha2/zz_generated.deepcopy.go → ...ger/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/...r-api-provider-sidero/api/v1alpha3/doc.go → ...ps-controller-manager/api/v1alpha3/doc.go b/...r-api-provider-sidero/api/v1alpha3/doc.go → ...ps-controller-manager/api/v1alpha3/doc.go
diff --git a/...-sidero/api/v1alpha3/groupversion_info.go → ...manager/api/v1alpha3/groupversion_info.go b/...-sidero/api/v1alpha3/groupversion_info.go → ...manager/api/v1alpha3/groupversion_info.go
diff --git a/...o/api/v1alpha3/metalcluster_conversion.go → ...r/api/v1alpha3/metalcluster_conversion.go b/...o/api/v1alpha3/metalcluster_conversion.go → ...r/api/v1alpha3/metalcluster_conversion.go
diff --git a/...sidero/api/v1alpha3/metalcluster_types.go → ...anager/api/v1alpha3/metalcluster_types.go b/...sidero/api/v1alpha3/metalcluster_types.go → ...anager/api/v1alpha3/metalcluster_types.go
diff --git a/...dero/api/v1alpha3/metalcluster_webhook.go → ...ager/api/v1alpha3/metalcluster_webhook.go b/...dero/api/v1alpha3/metalcluster_webhook.go → ...ager/api/v1alpha3/metalcluster_webhook.go
diff --git a/.../api/v1alpha3/metalclusterlist_webhook.go → .../api/v1alpha3/metalclusterlist_webhook.go b/.../api/v1alpha3/metalclusterlist_webhook.go → .../api/v1alpha3/metalclusterlist_webhook.go
diff --git a/...o/api/v1alpha3/metalmachine_conversion.go → ...r/api/v1alpha3/metalmachine_conversion.go b/...o/api/v1alpha3/metalmachine_conversion.go → ...r/api/v1alpha3/metalmachine_conversion.go
diff --git a/...sidero/api/v1alpha3/metalmachine_types.go → ...anager/api/v1alpha3/metalmachine_types.go b/...sidero/api/v1alpha3/metalmachine_types.go → ...anager/api/v1alpha3/metalmachine_types.go
diff --git a/...dero/api/v1alpha3/metalmachine_webhook.go → ...ager/api/v1alpha3/metalmachine_webhook.go b/...dero/api/v1alpha3/metalmachine_webhook.go → ...ager/api/v1alpha3/metalmachine_webhook.go
diff --git a/.../api/v1alpha3/metalmachinelist_webhook.go → .../api/v1alpha3/metalmachinelist_webhook.go b/.../api/v1alpha3/metalmachinelist_webhook.go → .../api/v1alpha3/metalmachinelist_webhook.go
diff --git a/...alpha3/metalmachinetemplate_conversion.go → ...alpha3/metalmachinetemplate_conversion.go b/...alpha3/metalmachinetemplate_conversion.go → ...alpha3/metalmachinetemplate_conversion.go
diff --git a/...pi/v1alpha3/metalmachinetemplate_types.go → ...pi/v1alpha3/metalmachinetemplate_types.go b/...pi/v1alpha3/metalmachinetemplate_types.go → ...pi/v1alpha3/metalmachinetemplate_types.go
diff --git a/.../v1alpha3/metalmachinetemplate_webhook.go → .../v1alpha3/metalmachinetemplate_webhook.go b/.../v1alpha3/metalmachinetemplate_webhook.go → .../v1alpha3/metalmachinetemplate_webhook.go
diff --git a/...lpha3/metalmachinetemplatelist_webhook.go → ...lpha3/metalmachinetemplatelist_webhook.go b/...lpha3/metalmachinetemplatelist_webhook.go → ...lpha3/metalmachinetemplatelist_webhook.go
diff --git a/.../api/v1alpha3/serverbinding_conversion.go → .../api/v1alpha3/serverbinding_conversion.go b/.../api/v1alpha3/serverbinding_conversion.go → .../api/v1alpha3/serverbinding_conversion.go
diff --git a/...idero/api/v1alpha3/serverbinding_types.go → ...nager/api/v1alpha3/serverbinding_types.go b/...idero/api/v1alpha3/serverbinding_types.go → ...nager/api/v1alpha3/serverbinding_types.go
diff --git a/...ero/api/v1alpha3/serverbinding_webhook.go → ...ger/api/v1alpha3/serverbinding_webhook.go b/...ero/api/v1alpha3/serverbinding_webhook.go → ...ger/api/v1alpha3/serverbinding_webhook.go
diff --git a/...api/v1alpha3/serverbindinglist_webhook.go → ...api/v1alpha3/serverbindinglist_webhook.go b/...api/v1alpha3/serverbindinglist_webhook.go → ...api/v1alpha3/serverbindinglist_webhook.go
diff --git a/...ider-sidero/api/v1alpha3/v1alpha3_test.go → ...ler-manager/api/v1alpha3/v1alpha3_test.go b/...ider-sidero/api/v1alpha3/v1alpha3_test.go → ...ler-manager/api/v1alpha3/v1alpha3_test.go
diff --git a/...ero/api/v1alpha3/zz_generated.deepcopy.go → ...ger/api/v1alpha3/zz_generated.deepcopy.go b/...ero/api/v1alpha3/zz_generated.deepcopy.go → ...ger/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/...idero/config/certmanager/certificate.yaml → ...nager/config/certmanager/certificate.yaml b/...idero/config/certmanager/certificate.yaml → ...nager/config/certmanager/certificate.yaml
diff --git a/...ero/config/certmanager/kustomization.yaml → ...ger/config/certmanager/kustomization.yaml b/...ero/config/certmanager/kustomization.yaml → ...ger/config/certmanager/kustomization.yaml
diff --git a/...o/config/certmanager/kustomizeconfig.yaml → ...r/config/certmanager/kustomizeconfig.yaml b/...o/config/certmanager/kustomizeconfig.yaml → ...r/config/certmanager/kustomizeconfig.yaml
diff --git a/...cture.cluster.x-k8s.io_metalclusters.yaml → ...cture.cluster.x-k8s.io_metalclusters.yaml b/...cture.cluster.x-k8s.io_metalclusters.yaml → ...cture.cluster.x-k8s.io_metalclusters.yaml
diff --git a/...cture.cluster.x-k8s.io_metalmachines.yaml → ...cture.cluster.x-k8s.io_metalmachines.yaml b/...cture.cluster.x-k8s.io_metalmachines.yaml → ...cture.cluster.x-k8s.io_metalmachines.yaml
diff --git a/...uster.x-k8s.io_metalmachinetemplates.yaml → ...uster.x-k8s.io_metalmachinetemplates.yaml b/...uster.x-k8s.io_metalmachinetemplates.yaml → ...uster.x-k8s.io_metalmachinetemplates.yaml
diff --git a/...ture.cluster.x-k8s.io_serverbindings.yaml → ...ture.cluster.x-k8s.io_serverbindings.yaml b/...ture.cluster.x-k8s.io_serverbindings.yaml → ...ture.cluster.x-k8s.io_serverbindings.yaml
diff --git a/...ider-sidero/config/crd/kustomization.yaml → ...ler-manager/config/crd/kustomization.yaml b/...ider-sidero/config/crd/kustomization.yaml → ...ler-manager/config/crd/kustomization.yaml
diff --git a/...er-sidero/config/crd/kustomizeconfig.yaml → ...r-manager/config/crd/kustomizeconfig.yaml b/...er-sidero/config/crd/kustomizeconfig.yaml → ...r-manager/config/crd/kustomizeconfig.yaml
diff --git a/...patches/cainjection_in_metalclusters.yaml → ...patches/cainjection_in_metalclusters.yaml b/...patches/cainjection_in_metalclusters.yaml → ...patches/cainjection_in_metalclusters.yaml
diff --git a/...patches/cainjection_in_metalmachines.yaml → ...patches/cainjection_in_metalmachines.yaml b/...patches/cainjection_in_metalmachines.yaml → ...patches/cainjection_in_metalmachines.yaml
diff --git a/...cainjection_in_metalmachinetemplates.yaml → ...cainjection_in_metalmachinetemplates.yaml b/...cainjection_in_metalmachinetemplates.yaml → ...cainjection_in_metalmachinetemplates.yaml
diff --git a/...atches/cainjection_in_serverbindings.yaml → ...atches/cainjection_in_serverbindings.yaml b/...atches/cainjection_in_serverbindings.yaml → ...atches/cainjection_in_serverbindings.yaml
diff --git a/...crd/patches/webhook_in_metalclusters.yaml → ...crd/patches/webhook_in_metalclusters.yaml b/...crd/patches/webhook_in_metalclusters.yaml → ...crd/patches/webhook_in_metalclusters.yaml
diff --git a/...crd/patches/webhook_in_metalmachines.yaml → ...crd/patches/webhook_in_metalmachines.yaml b/...crd/patches/webhook_in_metalmachines.yaml → ...crd/patches/webhook_in_metalmachines.yaml
diff --git a/...hes/webhook_in_metalmachinetemplates.yaml → ...hes/webhook_in_metalmachinetemplates.yaml b/...hes/webhook_in_metalmachinetemplates.yaml → ...hes/webhook_in_metalmachinetemplates.yaml
diff --git a/...rd/patches/webhook_in_serverbindings.yaml → ...rd/patches/webhook_in_serverbindings.yaml b/...rd/patches/webhook_in_serverbindings.yaml → ...rd/patches/webhook_in_serverbindings.yaml
diff --git a/...-sidero/config/default/kustomization.yaml → ...manager/config/default/kustomization.yaml b/...-sidero/config/default/kustomization.yaml → ...manager/config/default/kustomization.yaml
diff --git a/...provider-sidero/config/kustomization.yaml → ...troller-manager/config/kustomization.yaml b/...provider-sidero/config/kustomization.yaml → ...troller-manager/config/kustomization.yaml
diff --git a/...-sidero/config/manager/kustomization.yaml → ...manager/config/manager/kustomization.yaml b/...-sidero/config/manager/kustomization.yaml → ...manager/config/manager/kustomization.yaml
diff --git a/...ovider-sidero/config/manager/manager.yaml → ...oller-manager/config/manager/manager.yaml b/...ovider-sidero/config/manager/manager.yaml → ...oller-manager/config/manager/manager.yaml
diff --git a/...o/config/patch_crd_webhook_namespace.yaml → ...r/config/patch_crd_webhook_namespace.yaml b/...o/config/patch_crd_webhook_namespace.yaml → ...r/config/patch_crd_webhook_namespace.yaml
diff --git a/...dero/config/prometheus/kustomization.yaml → ...ager/config/prometheus/kustomization.yaml b/...dero/config/prometheus/kustomization.yaml → ...ager/config/prometheus/kustomization.yaml
diff --git a/...der-sidero/config/prometheus/monitor.yaml → ...er-manager/config/prometheus/monitor.yaml b/...der-sidero/config/prometheus/monitor.yaml → ...er-manager/config/prometheus/monitor.yaml
diff --git a/...r-sidero/config/rbac/auth_proxy_role.yaml → ...-manager/config/rbac/auth_proxy_role.yaml b/...r-sidero/config/rbac/auth_proxy_role.yaml → ...-manager/config/rbac/auth_proxy_role.yaml
diff --git a/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml b/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml
diff --git a/...idero/config/rbac/auth_proxy_service.yaml → ...nager/config/rbac/auth_proxy_service.yaml b/...idero/config/rbac/auth_proxy_service.yaml → ...nager/config/rbac/auth_proxy_service.yaml
diff --git a/...der-sidero/config/rbac/kustomization.yaml → ...er-manager/config/rbac/kustomization.yaml b/...der-sidero/config/rbac/kustomization.yaml → ...er-manager/config/rbac/kustomization.yaml
diff --git a/...ero/config/rbac/leader_election_role.yaml → ...ger/config/rbac/leader_election_role.yaml b/...ero/config/rbac/leader_election_role.yaml → ...ger/config/rbac/leader_election_role.yaml
diff --git a/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml b/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml
diff --git a/...config/rbac/metalcluster_editor_role.yaml → ...config/rbac/metalcluster_editor_role.yaml b/...config/rbac/metalcluster_editor_role.yaml → ...config/rbac/metalcluster_editor_role.yaml
diff --git a/...config/rbac/metalcluster_viewer_role.yaml → ...config/rbac/metalcluster_viewer_role.yaml b/...config/rbac/metalcluster_viewer_role.yaml → ...config/rbac/metalcluster_viewer_role.yaml
diff --git a/...config/rbac/metalmachine_editor_role.yaml → ...config/rbac/metalmachine_editor_role.yaml b/...config/rbac/metalmachine_editor_role.yaml → ...config/rbac/metalmachine_editor_role.yaml
diff --git a/...config/rbac/metalmachine_viewer_role.yaml → ...config/rbac/metalmachine_viewer_role.yaml b/...config/rbac/metalmachine_viewer_role.yaml → ...config/rbac/metalmachine_viewer_role.yaml
diff --git a/...bac/metalmachinetemplate_editor_role.yaml → ...bac/metalmachinetemplate_editor_role.yaml b/...bac/metalmachinetemplate_editor_role.yaml → ...bac/metalmachinetemplate_editor_role.yaml
diff --git a/...bac/metalmachinetemplate_viewer_role.yaml → ...bac/metalmachinetemplate_viewer_role.yaml b/...bac/metalmachinetemplate_viewer_role.yaml → ...bac/metalmachinetemplate_viewer_role.yaml
diff --git a/...api-provider-sidero/config/rbac/role.yaml → ...-controller-manager/config/rbac/role.yaml b/...api-provider-sidero/config/rbac/role.yaml → ...-controller-manager/config/rbac/role.yaml
diff --git a/...ider-sidero/config/rbac/role_binding.yaml → ...ler-manager/config/rbac/role_binding.yaml b/...ider-sidero/config/rbac/role_binding.yaml → ...ler-manager/config/rbac/role_binding.yaml
diff --git a/...-sidero/config/webhook/kustomization.yaml → ...manager/config/webhook/kustomization.yaml b/...-sidero/config/webhook/kustomization.yaml → ...manager/config/webhook/kustomization.yaml
diff --git a/...idero/config/webhook/kustomizeconfig.yaml → ...nager/config/webhook/kustomizeconfig.yaml b/...idero/config/webhook/kustomizeconfig.yaml → ...nager/config/webhook/kustomizeconfig.yaml
diff --git a/...config/webhook/manager_webhook_patch.yaml → ...config/webhook/manager_webhook_patch.yaml b/...config/webhook/manager_webhook_patch.yaml → ...config/webhook/manager_webhook_patch.yaml
diff --git a/...ovider-sidero/config/webhook/service.yaml → ...oller-manager/config/webhook/service.yaml b/...ovider-sidero/config/webhook/service.yaml → ...oller-manager/config/webhook/service.yaml
diff --git a/...fig/webhook/webhookcainjection_patch.yaml → ...fig/webhook/webhookcainjection_patch.yaml b/...fig/webhook/webhookcainjection_patch.yaml → ...fig/webhook/webhookcainjection_patch.yaml
diff --git a/...ro/controllers/metalcluster_controller.go → ...er/controllers/metalcluster_controller.go b/...ro/controllers/metalcluster_controller.go → ...er/controllers/metalcluster_controller.go
@@ -20,8 +20,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3"
-	"github.com/talos-systems/sidero/app/cluster-api-provider-sidero/pkg/constants"
+	infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
+	"github.com/talos-systems/sidero/app/caps-controller-manager/pkg/constants"
 )
 
 // MetalClusterReconciler reconciles a MetalCluster object.

diff --git a/...ro/controllers/metalmachine_controller.go → ...er/controllers/metalmachine_controller.go b/...ro/controllers/metalmachine_controller.go → ...er/controllers/metalmachine_controller.go
@@ -29,9 +29,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 
-	infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3"
-	"github.com/talos-systems/sidero/app/cluster-api-provider-sidero/pkg/constants"
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
+	"github.com/talos-systems/sidero/app/caps-controller-manager/pkg/constants"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 )
 
 var ErrNoServersInServerClass = errors.New("no servers available in serverclass")

diff --git a/...o/controllers/serverbinding_controller.go → ...r/controllers/serverbinding_controller.go b/...o/controllers/serverbinding_controller.go → ...r/controllers/serverbinding_controller.go
@@ -22,8 +22,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3"
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 )
 
 // ServerBindingReconciler reconciles a ServerBinding object.

diff --git a/...provider-sidero/controllers/suite_test.go → ...troller-manager/controllers/suite_test.go b/...provider-sidero/controllers/suite_test.go → ...troller-manager/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/app/cluster-api-provider-sidero/api/v1alpha2"
+	infrastructurev1alpha2 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha2"
 	// +kubebuilder:scaffold:imports
 )
 

diff --git a/app/cluster-api-provider-sidero/main.go → app/caps-controller-manager/main.go b/app/cluster-api-provider-sidero/main.go → app/caps-controller-manager/main.go
@@ -21,10 +21,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	infrav1alpha2 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha2"
-	infrav1alpha3 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3"
-	"github.com/talos-systems/sidero/app/cluster-api-provider-sidero/controllers"
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	infrav1alpha2 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha2"
+	infrav1alpha3 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
+	"github.com/talos-systems/sidero/app/caps-controller-manager/controllers"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 	// +kubebuilder:scaffold:imports
 )
 

diff --git a/...rovider-sidero/pkg/constants/constants.go → ...roller-manager/pkg/constants/constants.go b/...rovider-sidero/pkg/constants/constants.go → ...roller-manager/pkg/constants/constants.go
diff --git a/app/metal-controller-manager/PROJECT → app/sidero-controller-manager/PROJECT b/app/metal-controller-manager/PROJECT → app/sidero-controller-manager/PROJECT
@@ -1,5 +1,5 @@
 domain: sidero.dev
-repo: github.com/talos-systems/sidero/app/metal-controller-manager
+repo: github.com/talos-systems/sidero/app/sidero-controller-manager
 resources:
 - group: metal
   kind: Environment

diff --git a/...manager/api/v1alpha1/environment_types.go → ...manager/api/v1alpha1/environment_types.go b/...manager/api/v1alpha1/environment_types.go → ...manager/api/v1alpha1/environment_types.go
diff --git a/...manager/api/v1alpha1/groupversion_info.go → ...manager/api/v1alpha1/groupversion_info.go b/...manager/api/v1alpha1/groupversion_info.go → ...manager/api/v1alpha1/groupversion_info.go
diff --git a/...ller-manager/api/v1alpha1/server_types.go → ...ller-manager/api/v1alpha1/server_types.go b/...ller-manager/api/v1alpha1/server_types.go → ...ller-manager/api/v1alpha1/server_types.go
diff --git a/...manager/api/v1alpha1/server_types_test.go → ...manager/api/v1alpha1/server_types_test.go b/...manager/api/v1alpha1/server_types_test.go → ...manager/api/v1alpha1/server_types_test.go
@@ -8,7 +8,7 @@ package v1alpha1_test
 import (
 	"testing"
 
-	"github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 )
 
 func Test_PartialEqual(t *testing.T) {

diff --git a/...anager/api/v1alpha1/serverclass_filter.go → ...anager/api/v1alpha1/serverclass_filter.go b/...anager/api/v1alpha1/serverclass_filter.go → ...anager/api/v1alpha1/serverclass_filter.go
diff --git a/...r/api/v1alpha1/serverclass_filter_test.go → ...r/api/v1alpha1/serverclass_filter_test.go b/...r/api/v1alpha1/serverclass_filter_test.go → ...r/api/v1alpha1/serverclass_filter_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 )
 
 func TestFilterAcceptedServers(t *testing.T) {

diff --git a/...manager/api/v1alpha1/serverclass_types.go → ...manager/api/v1alpha1/serverclass_types.go b/...manager/api/v1alpha1/serverclass_types.go → ...manager/api/v1alpha1/serverclass_types.go
diff --git a/...-controller-manager/api/v1alpha1/types.go → ...-controller-manager/api/v1alpha1/types.go b/...-controller-manager/api/v1alpha1/types.go → ...-controller-manager/api/v1alpha1/types.go
diff --git a/...ger/api/v1alpha1/zz_generated.deepcopy.go → ...ger/api/v1alpha1/zz_generated.deepcopy.go b/...ger/api/v1alpha1/zz_generated.deepcopy.go → ...ger/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/...etal-controller-manager/cmd/agent/main.go → ...dero-controller-manager/cmd/agent/main.go b/...etal-controller-manager/cmd/agent/main.go → ...dero-controller-manager/cmd/agent/main.go
@@ -28,10 +28,10 @@ import (
 	"golang.org/x/sys/unix"
 	"google.golang.org/grpc"
 
-	"github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/internal/api"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/ipmi"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/internal/api"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/ipmi"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants"
 )
 
 const (

diff --git a/...nager/config/certmanager/certificate.yaml → ...nager/config/certmanager/certificate.yaml b/...nager/config/certmanager/certificate.yaml → ...nager/config/certmanager/certificate.yaml
diff --git a/...ger/config/certmanager/kustomization.yaml → ...ger/config/certmanager/kustomization.yaml b/...ger/config/certmanager/kustomization.yaml → ...ger/config/certmanager/kustomization.yaml
diff --git a/...r/config/certmanager/kustomizeconfig.yaml → ...r/config/certmanager/kustomizeconfig.yaml b/...r/config/certmanager/kustomizeconfig.yaml → ...r/config/certmanager/kustomizeconfig.yaml
diff --git a/.../bases/metal.sidero.dev_environments.yaml → .../bases/metal.sidero.dev_environments.yaml b/.../bases/metal.sidero.dev_environments.yaml → .../bases/metal.sidero.dev_environments.yaml
diff --git a/...bases/metal.sidero.dev_serverclasses.yaml → ...bases/metal.sidero.dev_serverclasses.yaml b/...bases/metal.sidero.dev_serverclasses.yaml → ...bases/metal.sidero.dev_serverclasses.yaml
diff --git a/...g/crd/bases/metal.sidero.dev_servers.yaml → ...g/crd/bases/metal.sidero.dev_servers.yaml b/...g/crd/bases/metal.sidero.dev_servers.yaml → ...g/crd/bases/metal.sidero.dev_servers.yaml
diff --git a/...ler-manager/config/crd/kustomization.yaml → ...ler-manager/config/crd/kustomization.yaml b/...ler-manager/config/crd/kustomization.yaml → ...ler-manager/config/crd/kustomization.yaml
diff --git a/...r-manager/config/crd/kustomizeconfig.yaml → ...r-manager/config/crd/kustomizeconfig.yaml b/...r-manager/config/crd/kustomizeconfig.yaml → ...r-manager/config/crd/kustomizeconfig.yaml
diff --git a/.../patches/cainjection_in_environments.yaml → .../patches/cainjection_in_environments.yaml b/.../patches/cainjection_in_environments.yaml → .../patches/cainjection_in_environments.yaml
diff --git a/...patches/cainjection_in_serverclasses.yaml → ...patches/cainjection_in_serverclasses.yaml b/...patches/cainjection_in_serverclasses.yaml → ...patches/cainjection_in_serverclasses.yaml
diff --git a/...g/crd/patches/cainjection_in_servers.yaml → ...g/crd/patches/cainjection_in_servers.yaml b/...g/crd/patches/cainjection_in_servers.yaml → ...g/crd/patches/cainjection_in_servers.yaml
diff --git a/.../crd/patches/webhook_in_environments.yaml → .../crd/patches/webhook_in_environments.yaml b/.../crd/patches/webhook_in_environments.yaml → .../crd/patches/webhook_in_environments.yaml
diff --git a/...crd/patches/webhook_in_serverclasses.yaml → ...crd/patches/webhook_in_serverclasses.yaml b/...crd/patches/webhook_in_serverclasses.yaml → ...crd/patches/webhook_in_serverclasses.yaml
diff --git a/...onfig/crd/patches/webhook_in_servers.yaml → ...onfig/crd/patches/webhook_in_servers.yaml b/...onfig/crd/patches/webhook_in_servers.yaml → ...onfig/crd/patches/webhook_in_servers.yaml
diff --git a/...troller-manager/config/kustomization.yaml → ...troller-manager/config/kustomization.yaml b/...troller-manager/config/kustomization.yaml → ...troller-manager/config/kustomization.yaml
diff --git a/...manager/config/manager/kustomization.yaml → ...manager/config/manager/kustomization.yaml b/...manager/config/manager/kustomization.yaml → ...manager/config/manager/kustomization.yaml
diff --git a/...oller-manager/config/manager/manager.yaml → ...oller-manager/config/manager/manager.yaml b/...oller-manager/config/manager/manager.yaml → ...oller-manager/config/manager/manager.yaml
@@ -9,7 +9,7 @@ spec:
       targetPort: tftp
       protocol: UDP
   selector:
-    control-plane: metal-controller-manager
+    control-plane: sidero-controller-manager
 ---
 apiVersion: v1
 kind: Service
@@ -22,24 +22,24 @@ spec:
       targetPort: http
       protocol: TCP
   selector:
-    control-plane: metal-controller-manager
+    control-plane: sidero-controller-manager
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
   namespace: system
   labels:
-    control-plane: metal-controller-manager
+    control-plane: sidero-controller-manager
 spec:
   selector:
     matchLabels:
-      control-plane: metal-controller-manager
+      control-plane: sidero-controller-manager
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: metal-controller-manager
+        control-plane: sidero-controller-manager
     spec:
       hostNetwork: ${SIDERO_CONTROLLER_MANAGER_HOST_NETWORK:=false}
       containers:

diff --git a/...manager/config/manager_webhook_patch.yaml → ...manager/config/manager_webhook_patch.yaml b/...manager/config/manager_webhook_patch.yaml → ...manager/config/manager_webhook_patch.yaml
diff --git a/...ager/config/prometheus/kustomization.yaml → ...ager/config/prometheus/kustomization.yaml b/...ager/config/prometheus/kustomization.yaml → ...ager/config/prometheus/kustomization.yaml
diff --git a/...er-manager/config/prometheus/monitor.yaml → ...er-manager/config/prometheus/monitor.yaml b/...er-manager/config/prometheus/monitor.yaml → ...er-manager/config/prometheus/monitor.yaml
diff --git a/...-manager/config/rbac/auth_proxy_role.yaml → ...-manager/config/rbac/auth_proxy_role.yaml b/...-manager/config/rbac/auth_proxy_role.yaml → ...-manager/config/rbac/auth_proxy_role.yaml
diff --git a/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml b/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml
diff --git a/...nager/config/rbac/auth_proxy_service.yaml → ...nager/config/rbac/auth_proxy_service.yaml b/...nager/config/rbac/auth_proxy_service.yaml → ...nager/config/rbac/auth_proxy_service.yaml
diff --git a/.../config/rbac/environment_editor_role.yaml → .../config/rbac/environment_editor_role.yaml b/.../config/rbac/environment_editor_role.yaml → .../config/rbac/environment_editor_role.yaml
diff --git a/.../config/rbac/environment_viewer_role.yaml → .../config/rbac/environment_viewer_role.yaml b/.../config/rbac/environment_viewer_role.yaml → .../config/rbac/environment_viewer_role.yaml
diff --git a/...er-manager/config/rbac/kustomization.yaml → ...er-manager/config/rbac/kustomization.yaml b/...er-manager/config/rbac/kustomization.yaml → ...er-manager/config/rbac/kustomization.yaml
diff --git a/...ger/config/rbac/leader_election_role.yaml → ...ger/config/rbac/leader_election_role.yaml b/...ger/config/rbac/leader_election_role.yaml → ...ger/config/rbac/leader_election_role.yaml
diff --git a/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml b/...ig/rbac/leader_election_role_binding.yaml → ...ig/rbac/leader_election_role_binding.yaml
diff --git a/...-controller-manager/config/rbac/role.yaml → ...-controller-manager/config/rbac/role.yaml b/...-controller-manager/config/rbac/role.yaml → ...-controller-manager/config/rbac/role.yaml
diff --git a/...ler-manager/config/rbac/role_binding.yaml → ...ler-manager/config/rbac/role_binding.yaml b/...ler-manager/config/rbac/role_binding.yaml → ...ler-manager/config/rbac/role_binding.yaml
diff --git a/...nager/config/rbac/server_editor_role.yaml → ...nager/config/rbac/server_editor_role.yaml b/...nager/config/rbac/server_editor_role.yaml → ...nager/config/rbac/server_editor_role.yaml
diff --git a/...nager/config/rbac/server_viewer_role.yaml → ...nager/config/rbac/server_viewer_role.yaml b/...nager/config/rbac/server_viewer_role.yaml → ...nager/config/rbac/server_viewer_role.yaml
diff --git a/.../config/rbac/serverclass_editor_role.yaml → .../config/rbac/serverclass_editor_role.yaml b/.../config/rbac/serverclass_editor_role.yaml → .../config/rbac/serverclass_editor_role.yaml
diff --git a/.../config/rbac/serverclass_viewer_role.yaml → .../config/rbac/serverclass_viewer_role.yaml b/.../config/rbac/serverclass_viewer_role.yaml → .../config/rbac/serverclass_viewer_role.yaml
diff --git a/...g/samples/metal_v1alpha1_environment.yaml → ...g/samples/metal_v1alpha1_environment.yaml b/...g/samples/metal_v1alpha1_environment.yaml → ...g/samples/metal_v1alpha1_environment.yaml
diff --git a/...config/samples/metal_v1alpha1_server.yaml → ...config/samples/metal_v1alpha1_server.yaml b/...config/samples/metal_v1alpha1_server.yaml → ...config/samples/metal_v1alpha1_server.yaml
diff --git a/...g/samples/metal_v1alpha1_serverclass.yaml → ...g/samples/metal_v1alpha1_serverclass.yaml b/...g/samples/metal_v1alpha1_serverclass.yaml → ...g/samples/metal_v1alpha1_serverclass.yaml
diff --git a/...manager/config/webhook/kustomization.yaml → ...manager/config/webhook/kustomization.yaml b/...manager/config/webhook/kustomization.yaml → ...manager/config/webhook/kustomization.yaml
diff --git a/...nager/config/webhook/kustomizeconfig.yaml → ...nager/config/webhook/kustomizeconfig.yaml b/...nager/config/webhook/kustomizeconfig.yaml → ...nager/config/webhook/kustomizeconfig.yaml
diff --git a/...oller-manager/config/webhook/service.yaml → ...oller-manager/config/webhook/service.yaml b/...oller-manager/config/webhook/service.yaml → ...oller-manager/config/webhook/service.yaml
diff --git a/...ager/config/webhookcainjection_patch.yaml → ...ager/config/webhookcainjection_patch.yaml b/...ager/config/webhookcainjection_patch.yaml → ...ager/config/webhookcainjection_patch.yaml
diff --git a/...ger/controllers/environment_controller.go → ...ger/controllers/environment_controller.go b/...ger/controllers/environment_controller.go → ...ger/controllers/environment_controller.go
@@ -24,8 +24,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants"
 )
 
 // EnvironmentReconciler reconciles a Environment object.

diff --git a/...-manager/controllers/server_controller.go → ...-manager/controllers/server_controller.go b/...-manager/controllers/server_controller.go → ...-manager/controllers/server_controller.go
@@ -30,10 +30,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	infrav1 "github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3"
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/internal/power/metal"
-	"github.com/talos-systems/sidero/app/metal-controller-manager/pkg/constants"
+	infrav1 "github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/internal/power/metal"
+	"github.com/talos-systems/sidero/app/sidero-controller-manager/pkg/constants"
 )
 
 const (

diff --git a/...ger/controllers/serverclass_controller.go → ...ger/controllers/serverclass_controller.go b/...ger/controllers/serverclass_controller.go → ...ger/controllers/serverclass_controller.go
@@ -20,7 +20,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	metalv1alpha1 "github.com/talos-systems/sidero/app/metal-controller-manager/api/v1alpha1"
+	metalv1alpha1 "github.com/talos-systems/sidero/app/sidero-controller-manager/api/v1alpha1"
 )
 
 // ServerClassReconciler reconciles a ServerClass object.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		package v1alpha2

		// +k8s:conversion-gen=github.com/talos-systems/sidero/app/cluster-api-provider-sidero/api/v1alpha3
		// +k8s:conversion-gen=github.com/talos-systems/sidero/app/caps-controller-manager/api/v1alpha3