Cleanup exp packages

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

Makefile

@@ -289,10 +289,6 @@ generate-manifests-core: $(CONTROLLER_GEN) $(KUSTOMIZE) ## Generate manifests e.
 		paths=./internal/controllers/... \
 		paths=./internal/webhooks/... \
 		paths=./internal/api/addons/... \
-		paths=./exp/internal/controllers/... \
-		paths=./exp/internal/webhooks/... \
-		paths=./exp/ipam/internal/webhooks/... \
-		paths=./exp/runtime/internal/controllers/... \
 		crd:crdVersions=v1 \
 		rbac:roleName=manager-role \
 		output:crd:dir=./config/crd/bases \
@@ -483,7 +479,7 @@ generate-go-conversions-addons-api: $(CONVERSION_GEN) ## Generate conversions go
 		./api/addons/v1beta1
 
 .PHONY: generate-go-conversions-core-ipam
-generate-go-conversions-core-ipam: $(CONVERSION_GEN) ## Generate conversions go code for core exp IPAM
+generate-go-conversions-core-ipam: $(CONVERSION_GEN) ## Generate conversions go code for IPAM
 	$(MAKE) clean-generated-conversions SRC_DIRS="./api/ipam/v1beta1,./api/ipam/v1alpha1"
 	$(CONVERSION_GEN) \
 		--output-file=zz_generated.conversion.go \

controllers/alias.go

@@ -34,9 +34,11 @@ import (
 	clusterclasscontroller "sigs.k8s.io/cluster-api/internal/controllers/clusterclass"
 	"sigs.k8s.io/cluster-api/internal/controllers/clusterresourceset"
 	"sigs.k8s.io/cluster-api/internal/controllers/clusterresourcesetbinding"
+	extensionconfigcontroller "sigs.k8s.io/cluster-api/internal/controllers/extensionconfig"
 	machinecontroller "sigs.k8s.io/cluster-api/internal/controllers/machine"
 	machinedeploymentcontroller "sigs.k8s.io/cluster-api/internal/controllers/machinedeployment"
 	machinehealthcheckcontroller "sigs.k8s.io/cluster-api/internal/controllers/machinehealthcheck"
+	machinepoolcontroller "sigs.k8s.io/cluster-api/internal/controllers/machinepool"
 	machinesetcontroller "sigs.k8s.io/cluster-api/internal/controllers/machineset"
 	clustertopologycontroller "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster"
 	machinedeploymenttopologycontroller "sigs.k8s.io/cluster-api/internal/controllers/topology/machinedeployment"
@@ -279,3 +281,41 @@ func (r *ClusterResourceSetBindingReconciler) SetupWithManager(ctx context.Conte
 		WatchFilterValue: r.WatchFilterValue,
 	}).SetupWithManager(ctx, mgr, options)
 }
+
+// MachinePoolReconciler reconciles a MachinePool object.
+type MachinePoolReconciler struct {
+	Client       client.Client
+	APIReader    client.Reader
+	ClusterCache clustercache.ClusterCache
+
+	// WatchFilterValue is the label value used to filter events prior to reconciliation.
+	WatchFilterValue string
+}
+
+func (r *MachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
+	return (&machinepoolcontroller.Reconciler{
+		Client:           r.Client,
+		APIReader:        r.APIReader,
+		ClusterCache:     r.ClusterCache,
+		WatchFilterValue: r.WatchFilterValue,
+	}).SetupWithManager(ctx, mgr, options)
+}
+
+// ExtensionConfigReconciler reconciles an ExtensionConfig object.
+type ExtensionConfigReconciler struct {
+	Client        client.Client
+	APIReader     client.Reader
+	RuntimeClient runtimeclient.Client
+
+	// WatchFilterValue is the label value used to filter events prior to reconciliation.
+	WatchFilterValue string
+}
+
+func (r *ExtensionConfigReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options, partialSecretCache cache.Cache) error {
+	return (&extensionconfigcontroller.Reconciler{
+		Client:           r.Client,
+		APIReader:        r.APIReader,
+		RuntimeClient:    r.RuntimeClient,
+		WatchFilterValue: r.WatchFilterValue,
+	}).SetupWithManager(ctx, mgr, options, partialSecretCache)
+}