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 <robertspencersmith@gmail.com>

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

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

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
 

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

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

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).

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).

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).

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() {

internal/app/cluster-api-provider-sidero/config/kustomization.yaml

@@ -4,7 +4,7 @@ bases:
   - webhook
   - default
 
-namePrefix: sidero-provider-
+namePrefix: caps-
 
 patchesJson6902:
   - target:

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.

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"
 )
 

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
 )
 

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
 )