Merge pull request #112 from numtide/fix/controller-deletion-and-refactor

refactor(multigrescluster): split controller, fix deletion, and update API

Refactors the MultigresCluster controller for better maintainability and fixes critical issues with deletion and default resolution.

Key Changes:
- **Controller Refactor:** Split the monolithic `MultigresCluster` controller into logical files (`reconcile_global.go`, `reconcile_cells.go`, `reconcile_databases.go`, `status.go`).
- **Active Deletion:** Implemented "Active Deletion" logic in `checkChildrenDeleted`. The controller now explicitly deletes child resources (`Cells`, `TableGroups`) instead of relying solely on Garbage Collection. This fixes hanging tests in `envtest` environments.
- **Smart Defaulting Fix:** Updated `PopulateClusterDefaults` in the Resolver to propagate the Cluster's `Cells` to the default Shard's `MultiOrch` spec. This resolves the "MultiOrch has no cells" error in minimal configurations.
- **API Update:** Changed `GlobalTopoServer` and `MultiAdmin` fields in `MultigresClusterSpec` to pointers. This allows proper detection of "missing" vs "empty" fields for lazy configuration.
- **Tests:** Split unit and integration tests into focused files matching the controller structure. Updated test expectations to align with the new active deletion error messages and default injection logic.
- **Build:** Updated `Makefile` to use `kubectl apply --server-side` for installing CRDs to avoid size limit issues.

Author: fernando-villalba

Makefile

@@ -378,7 +378,7 @@ endif
 
 .PHONY: install
 install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config.
-	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/crd | $(KUBECTL) apply --server-side -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -387,7 +387,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/default | $(KUBECTL) apply --server-side -f -
 
 .PHONY: undeploy
 undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
@@ -420,12 +420,12 @@ kind-load: container ## Build and load image into kind cluster
 .PHONY: kind-deploy
 kind-deploy: kind-up manifests kustomize kind-load ## Deploy operator to kind cluster
 	@echo "==> Installing CRDs..."
-	KUBECONFIG=$(KIND_KUBECONFIG) $(KUSTOMIZE) build config/crd | KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) apply -f -
+	KUBECONFIG=$(KIND_KUBECONFIG) $(KUSTOMIZE) build config/crd | KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) apply --server-side -f -
 	@echo "==> Deploying operator..."
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	KUBECONFIG=$(KIND_KUBECONFIG) $(KUSTOMIZE) build config/default | KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) apply -f -
+	KUBECONFIG=$(KIND_KUBECONFIG) $(KUSTOMIZE) build config/default | KUBECONFIG=$(KIND_KUBECONFIG) $(KUBECTL) apply --server-side -f -
 	@echo "==> Deployment complete!"
-	@echo "Check status: KUBECONFIG=$(KIND_KUBECONFIG) kubectl get pods -n multigres-operator-system"
+	@echo "Check status: KUBECONFIG=$(KIND_KUBECONFIG) kubectl get pods -n multigres-operator"
 
 .PHONY: kind-redeploy
 kind-redeploy: kind-load ## Rebuild image, reload to kind, and restart pods

api/v1alpha1/multigrescluster_types.go

@@ -54,11 +54,11 @@ type MultigresClusterSpec struct {
 
 	// GlobalTopoServer defines the cluster-wide global topology server.
 	// +optional
-	GlobalTopoServer GlobalTopoServerSpec `json:"globalTopoServer,omitempty"`
+	GlobalTopoServer *GlobalTopoServerSpec `json:"globalTopoServer,omitempty"`
 
 	// MultiAdmin defines the configuration for the MultiAdmin component.
 	// +optional
-	MultiAdmin MultiAdminConfig `json:"multiadmin,omitempty"`
+	MultiAdmin *MultiAdminConfig `json:"multiadmin,omitempty"`
 
 	// Cells defines the list of cells (failure domains) in the cluster.
 	// +optional
@@ -239,7 +239,7 @@ type DatabaseConfig struct {
 }
 
 // TableGroupConfig defines a table group within a database.
-// +kubebuilder:validation:XValidation:rule="!self.default || self.name == 'default'",message="the default tablegroup must be named 'default'"
+// +kubebuilder:validation:XValidation:rule="!has(self.default) || !self.default || self.name == 'default'",message="the default tablegroup must be named 'default'"
 type TableGroupConfig struct {
 	// Name is the logical name of the table group.
 	// +kubebuilder:validation:MinLength=1

api/v1alpha1/zz_generated.deepcopy.go

@@ -6866,7 +6866,8 @@ spec:
                         type: object
                         x-kubernetes-validations:
                         - message: the default tablegroup must be named 'default'
-                          rule: '!self.default || self.name == ''default'''
+                          rule: '!has(self.default) || !self.default || self.name
+                            == ''default'''
                       maxItems: 20
                       type: array
                       x-kubernetes-list-map-keys:

config/crd/bases/multigres.com_multigresclusters.yaml

@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/numtide/multigres-operator
-  newTag: 9d6dd13-dirty
+  newTag: e2b8632-dirty