Merge pull request #63 from numtide/multi-cell-deployment-for-multiorch

Update MultiOrch to know about multiple Cells

Author: rytswd

api/v1alpha1/multiorch_types.go

@@ -25,7 +25,7 @@ import (
 // the fields to be serialized.
 
 // MultiOrchSpec defines the desired state of MultiOrch.
-type MultiOrchSpec struct {
+type MultiOrchSpec_X struct {
 	// CellName is the name of the cell this MultiOrch belongs to.
 	// +kubebuilder:validation:MinLength=1
 	// +optional
@@ -106,7 +106,7 @@ type MultiOrchSpec struct {
 }
 
 // MultiOrchStatus defines the observed state of MultiOrch.
-type MultiOrchStatus struct {
+type MultiOrchStatus_X struct {
 	// Ready indicates whether the MultiOrch is healthy and available.
 	Ready bool `json:"ready"`
 
@@ -134,7 +134,7 @@ type MultiOrchStatus struct {
 // +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
 
 // MultiOrch is the Schema for the multiorches API
-type MultiOrch struct {
+type MultiOrch_X struct {
 	metav1.TypeMeta `json:",inline"`
 
 	// metadata is a standard object metadata
@@ -143,22 +143,22 @@ type MultiOrch struct {
 
 	// spec defines the desired state of MultiOrch
 	// +required
-	Spec MultiOrchSpec `json:"spec"`
+	Spec MultiOrchSpec_X `json:"spec"`
 
 	// status defines the observed state of MultiOrch
 	// +optional
-	Status MultiOrchStatus `json:"status,omitempty,omitzero"`
+	Status MultiOrchStatus_X `json:"status,omitempty,omitzero"`
 }
 
 // +kubebuilder:object:root=true
 
 // MultiOrchList contains a list of MultiOrch
-type MultiOrchList struct {
-	metav1.TypeMeta `            json:",inline"`
-	metav1.ListMeta `            json:"metadata,omitempty"`
-	Items           []MultiOrch `json:"items"`
+type MultiOrchList_X struct {
+	metav1.TypeMeta `              json:",inline"`
+	metav1.ListMeta `              json:"metadata,omitempty"`
+	Items           []MultiOrch_X `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&MultiOrch{}, &MultiOrchList{})
+	SchemeBuilder.Register(&MultiOrch_X{}, &MultiOrchList_X{})
 }

api/v1alpha1/shard_types.go

@@ -62,6 +62,9 @@ type ShardPoolSpec struct {
 	// +kubebuilder:validation:Pattern:="^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
 	Cell string `json:"cell,omitempty"`
 
+	Database   string `json:"database,omitempty"`
+	TableGroup string `json:"tableGroup,omitempty"`
+
 	// Replicas is the desired number of pods in this pool.
 	// +kubebuilder:validation:Minimum=1
 	// +optional
@@ -83,6 +86,9 @@ type ShardPoolSpec struct {
 	// MultiPooler defines the configuration for the MultiPooler container.
 	// +optional
 	MultiPooler MultiPoolerSpec `json:"multipooler,omitempty"`
+
+	// MultiOrch defines the desired state of MultiOrch.
+	MultiOrch MultiOrchSpec `json:"multiOrch,omitempty"`
 }
 
 // PostgresSpec defines the configuration for the Postgres container.
@@ -99,6 +105,21 @@ type MultiPoolerSpec struct {
 	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
 }
 
+// MultiOrchSpec defines the configuration for the MultiPooler container.
+type MultiOrchSpec struct {
+	// Cells is the name of the cells MultiOrch needs to be deployed to.
+	Cells []string `json:"cells,omitempty"`
+
+	// Image is the MultiOrch container image to use.
+	// +kubebuilder:validation:MinLength=1
+	// +optional
+	Image string `json:"image,omitempty"`
+
+	// Resources defines the compute resource requirements for the MultiPooler container.
+	// +optional
+	Resources corev1.ResourceRequirements `json:"resources,omitempty"`
+}
+
 // ============================================================================
 // CR Controller Status Specs
 // ============================================================================