Merge pull request #66 from numtide/add-testutil-for-resource-watch

Add testutil for resource watching and declarative testing

Author: rytswd

api/v1alpha1/cell_types.go

@@ -103,7 +103,7 @@ type GlobalTopoServerRefSpec struct {
 // CellTopoServerSpec defines the topology server configuration for this cell.
 // Only one of External or ManagedSpec should be set.
 // If neither is set, the cell uses the top-level GlobalTopoServer.
-// +kubebuilder:validation:XValidation:rule="(has(self.external) ? 1 : 0) + (has(self.managedSpec) ? 1 : 0) <= 1",message="only one of 'external' or 'managedSpec' can be set for topoServer"
+// TODO: Add validation when External field is uncommented
 type CellTopoServerSpec struct {
 	// External defines connection details for an unmanaged, external topo server.
 	// +optional

api/v1alpha1/shard_types.go

@@ -49,7 +49,7 @@ type ShardImagesSpec struct {
 
 // ShardPoolSpec defines the desired state of a pool of shard replicas (e.g., primary, replica, read-only).
 // This is the core reusable spec for a shard's pod.
-// +kubebuilder:validation:XValidation:rule="!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources) && has(self.dataVolumeClaimTemplate.resources.requests) && has(self.dataVolumeClaimTemplate.resources.requests['storage']))",message="dataVolumeClaimTemplate must include a 'storage' resource request"
+// TODO: Re-enable storage validation when CEL cost budget is addressed (add maxItems to pools array)
 type ShardPoolSpec struct {
 	// Type of the pool (e.g., "replica", "readOnly").
 	// +kubebuilder:validation:Enum=replica;readOnly

api/v1alpha1/toposerver_types.go

@@ -40,7 +40,7 @@ type TopoServerChildSpec struct {
 // TopoServerSpec defines the desired state of a managed etcd cluster.
 // This is reusable for both Global and Local TopoServers.
 // +kubebuilder:validation:XValidation:rule="!has(self.replicas) || self.replicas % 2 == 1",message="etcd cluster replicas should be an odd number (1, 3, 5, etc.)"
-// +kubebuilder:validation:XValidation:rule="!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources) && has(self.dataVolumeClaimTemplate.resources.requests) && has(self.dataVolumeClaimTemplate.resources.requests['storage']))",message="dataVolumeClaimTemplate must include a 'storage' resource request"
+// TODO: Re-enable storage validation after adding StorageSize/StorageClassName fields for simpler configuration
 type TopoServerSpec struct {
 	// Image is the etcd container image to use.
 	// +kubebuilder:validation:MinLength=1

config/.gitkeep

@@ -3283,17 +3283,7 @@ spec:
                     - message: etcd cluster replicas should be an odd number (1, 3,
                         5, etc.)
                       rule: '!has(self.replicas) || self.replicas % 2 == 1'
-                    - message: dataVolumeClaimTemplate must include a 'storage' resource
-                        request
-                      rule: '!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources)
-                        && has(self.dataVolumeClaimTemplate.resources.requests) &&
-                        has(self.dataVolumeClaimTemplate.resources.requests[''storage'']))'
                 type: object
-                x-kubernetes-validations:
-                - message: only one of 'external' or 'managedSpec' can be set for
-                    topoServer
-                  rule: '(has(self.external) ? 1 : 0) + (has(self.managedSpec) ? 1
-                    : 0) <= 1'
               topologyReconciliation:
                 description: TopologyReconciliation defines flags for the cell controller's
                   reconciliation logic.

config/crd/bases/multigres.com_cells.yaml

@@ -1425,11 +1425,6 @@ spec:
                       - readOnly
                       type: string
                   type: object
-                  x-kubernetes-validations:
-                  - message: dataVolumeClaimTemplate must include a 'storage' resource
-                      request
-                    rule: '!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources)
-                      && has(self.dataVolumeClaimTemplate.resources.requests) && has(self.dataVolumeClaimTemplate.resources.requests[''storage'']))'
                 type: array
             type: object
             x-kubernetes-validations:

config/crd/bases/multigres.com_multiorch_xs.yaml

@@ -1443,12 +1443,6 @@ spec:
                           - readOnly
                           type: string
                       type: object
-                      x-kubernetes-validations:
-                      - message: dataVolumeClaimTemplate must include a 'storage'
-                          resource request
-                        rule: '!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources)
-                          && has(self.dataVolumeClaimTemplate.resources.requests)
-                          && has(self.dataVolumeClaimTemplate.resources.requests[''storage'']))'
                     type: array
                 type: object
                 x-kubernetes-validations:

config/crd/bases/multigres.com_shards.yaml

@@ -1250,9 +1250,6 @@ spec:
             x-kubernetes-validations:
             - message: etcd cluster replicas should be an odd number (1, 3, 5, etc.)
               rule: '!has(self.replicas) || self.replicas % 2 == 1'
-            - message: dataVolumeClaimTemplate must include a 'storage' resource request
-              rule: '!has(self.dataVolumeClaimTemplate) || (has(self.dataVolumeClaimTemplate.resources)
-                && has(self.dataVolumeClaimTemplate.resources.requests) && has(self.dataVolumeClaimTemplate.resources.requests[''storage'']))'
           status:
             description: TopoServerStatus defines the observed state of TopoServer
             properties:

config/crd/bases/multigres.com_tablegroups.yaml

@@ -12,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	multigresv1alpha1 "github.com/numtide/multigres-operator/api/v1alpha1"
@@ -276,11 +277,16 @@ func (r *EtcdReconciler) buildConditions(
 }
 
 // SetupWithManager sets up the controller with the Manager.
-// TODO: This is missing test coverage, and will need to use envtest setup.
-func (r *EtcdReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *EtcdReconciler) SetupWithManager(mgr ctrl.Manager, opts ...controller.Options) error {
+	controllerOpts := controller.Options{}
+	if len(opts) > 0 {
+		controllerOpts = opts[0]
+	}
+
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&multigresv1alpha1.Etcd{}).
 		Owns(&appsv1.StatefulSet{}).
 		Owns(&corev1.Service{}).
+		WithOptions(controllerOpts).
 		Complete(r)
 }