Update: reorg so that we use a similar structure to stateful set inst…

…ead of *imaginary* name
strangelove-ventures · Nov 19, 2024 · 62db355 · 62db355
1 parent 9dfdca0
commit 62db355
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 16 deletions.
diff --git a/api/v1/cosmosfullnode_types.go b/api/v1/cosmosfullnode_types.go
@@ -32,14 +32,20 @@ const CosmosFullNodeController = "CosmosFullNode"
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
+// Ordinal specifies the configuration for pod ordinal numbers
+type Ordinal struct {
+	// Start specifies the initial ordinal number for pod naming
+	// +kubebuilder:validation:Minimum:=0
+	Start *int32 `json:"start,omitempty"`
+}
+
 // FullNodeSpec defines the desired state of CosmosFullNode
 type FullNodeSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
-	// StartingOrdinal specifies the initial ordinal number for pod naming
-	// +kubebuilder:validation:Minimum:=0
-	StartingOrdinal *int32 `json:"startingOrdinal,omitempty"`
+	// Ordinal specifies the configuration for pod ordinal numbers
+	Ordinal Ordinal `json:"ordinal,omitempty"`
 
 	// Number of replicas to create.
 	// Individual replicas have a consistent identity.

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cosmos.strange.love_cosmosfullnodes.yaml b/config/crd/bases/cosmos.strange.love_cosmosfullnodes.yaml
@@ -555,6 +555,16 @@ spec:
                   Example: cosmos-1
                   Used for debugging.
                 type: object
+              ordinal:
+                description: Ordinal specifies the configuration for pod ordinal numbers
+                properties:
+                  start:
+                    description: Start specifies the initial ordinal number for pod
+                      naming
+                    format: int32
+                    minimum: 0
+                    type: integer
+                type: object
               podTemplate:
                 description: |-
                   Template applied to all pods.
@@ -5783,12 +5793,6 @@ spec:
                         type: string
                     type: object
                 type: object
-              startingOrdinal:
-                description: StartingOrdinal specifies the initial ordinal number
-                  for pod naming
-                format: int32
-                minimum: 0
-                type: integer
               strategy:
                 description: How to scale pods when performing an update.
                 properties:

diff --git a/controllers/cosmosfullnode_controller.go b/controllers/cosmosfullnode_controller.go
@@ -116,8 +116,8 @@ func (r *CosmosFullNodeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 
 	startingOrdinal := int32(0)
-	if crd.Spec.StartingOrdinal != nil {
-		startingOrdinal = *crd.Spec.StartingOrdinal
+	if crd.Spec.Ordinal.Start != nil {
+		startingOrdinal = *crd.Spec.Ordinal.Start
 	}
 
 	reporter := kube.NewEventReporter(logger, r.recorder, crd)