optimize & use starting ordinal for pvcs too

strangelove-ventures · Nov 20, 2024 · b9ccbfa · b9ccbfa
1 parent 62db355
commit b9ccbfa
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 14 deletions.
diff --git a/api/v1/cosmosfullnode_types.go b/api/v1/cosmosfullnode_types.go
@@ -36,7 +36,7 @@ const CosmosFullNodeController = "CosmosFullNode"
 type Ordinal struct {
 	// Start specifies the initial ordinal number for pod naming
 	// +kubebuilder:validation:Minimum:=0
-	Start *int32 `json:"start,omitempty"`
+	Start int32 `json:"start,omitempty"`
 }
 
 // FullNodeSpec defines the desired state of CosmosFullNode

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/controllers/cosmosfullnode_controller.go b/controllers/cosmosfullnode_controller.go
@@ -115,11 +115,6 @@ func (r *CosmosFullNodeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		return stopResult, client.IgnoreNotFound(err)
 	}
 
-	startingOrdinal := int32(0)
-	if crd.Spec.Ordinal.Start != nil {
-		startingOrdinal = *crd.Spec.Ordinal.Start
-	}
-
 	reporter := kube.NewEventReporter(logger, r.recorder, crd)
 
 	fullnode.ResetStatus(crd)
@@ -179,7 +174,7 @@ func (r *CosmosFullNodeReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 
 	// Reconcile pods.
-	podRequeue, err := r.podControl.Reconcile(ctx, reporter, crd, configCksums, syncInfo, startingOrdinal)
+	podRequeue, err := r.podControl.Reconcile(ctx, reporter, crd, configCksums, syncInfo, crd.Spec.Ordinal.Start)
 	if err != nil {
 		errs.Append(err)
 	}

diff --git a/internal/fullnode/pvc_builder.go b/internal/fullnode/pvc_builder.go
@@ -39,7 +39,7 @@ func BuildPVCs(
 	}
 
 	var pvcs []diff.Resource[*corev1.PersistentVolumeClaim]
-	for i := int32(0); i < crd.Spec.Replicas; i++ {
+	for i := crd.Spec.Ordinal.Start; i < crd.Spec.Ordinal.Start+crd.Spec.Replicas; i++ {
 		if pvcDisabled(crd, i) {
 			continue
 		}