make for loops consistent across all builders

strangelove-ventures · Dec 4, 2024 · 4595139 · 4595139
1 parent e0afa9b
commit 4595139
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/internal/fullnode/pvc_builder.go b/internal/fullnode/pvc_builder.go
@@ -39,16 +39,16 @@ func BuildPVCs(
 	}
 
 	var pvcs []diff.Resource[*corev1.PersistentVolumeClaim]
-	for i := int32(0); i < crd.Spec.Replicas; i++ {
-		ordinal := i + crd.Spec.Ordinals.Start
-		if pvcDisabled(crd, ordinal) {
+	for i := crd.Spec.Ordinals.Start; i < crd.Spec.Ordinals.Start+crd.Spec.Replicas; i++ {
+
+		if pvcDisabled(crd, i) {
 			continue
 		}
 
 		pvc := base.DeepCopy()
-		name := pvcName(crd, ordinal)
+		name := pvcName(crd, i)
 		pvc.Name = name
-		podName := instanceName(crd, ordinal)
+		podName := instanceName(crd, i)
 		pvc.Labels[kube.InstanceLabel] = podName
 
 		var dataSource *corev1.TypedLocalObjectReference

diff --git a/internal/fullnode/pvc_control.go b/internal/fullnode/pvc_control.go
@@ -51,9 +51,8 @@ func (control PVCControl) Reconcile(ctx context.Context, reporter kube.Reporter,
 
 	dataSources := make(map[int32]*dataSource)
 	if len(currentPVCs) < int(crd.Spec.Replicas) {
-		for i := int32(0); i < crd.Spec.Replicas; i++ {
-			ordinal := i + crd.Spec.Ordinals.Start
-			name := pvcName(crd, ordinal)
+		for i := crd.Spec.Ordinals.Start; i < crd.Spec.Ordinals.Start+crd.Spec.Replicas; i++ {
+			name := pvcName(crd, i)
 			found := false
 			for _, pvc := range currentPVCs {
 				if pvc.Name == name {
@@ -62,7 +61,7 @@ func (control PVCControl) Reconcile(ctx context.Context, reporter kube.Reporter,
 				}
 			}
 			if !found {
-				ds := control.findDataSource(ctx, reporter, crd, ordinal)
+				ds := control.findDataSource(ctx, reporter, crd, i)
 				if ds == nil {
 					ds = &dataSource{
 						size: crd.Spec.VolumeClaimTemplate.Resources.Requests[corev1.ResourceStorage],

diff --git a/internal/fullnode/service_builder.go b/internal/fullnode/service_builder.go
@@ -31,18 +31,15 @@ func BuildServices(crd *cosmosv1.CosmosFullNode) []diff.Resource[*corev1.Service
 	}
 	maxExternal := lo.Clamp(max, 0, crd.Spec.Replicas)
 	p2ps := make([]diff.Resource[*corev1.Service], crd.Spec.Replicas)
-	startOrdinal := crd.Spec.Ordinals.Start
-
-	for i := int32(0); i < crd.Spec.Replicas; i++ {
-		ordinal := startOrdinal + i
+	for i := crd.Spec.Ordinals.Start; i < crd.Spec.Ordinals.Start+crd.Spec.Replicas; i++ {
 		var svc corev1.Service
-		svc.Name = p2pServiceName(crd, ordinal)
+		svc.Name = p2pServiceName(crd, i)
 		svc.Namespace = crd.Namespace
 		svc.Kind = "Service"
 		svc.APIVersion = "v1"
 
 		svc.Labels = defaultLabels(crd,
-			kube.InstanceLabel, instanceName(crd, ordinal),
+			kube.InstanceLabel, instanceName(crd, i),
 			kube.ComponentLabel, "p2p",
 		)
 		svc.Annotations = map[string]string{}
@@ -55,7 +52,7 @@ func BuildServices(crd *cosmosv1.CosmosFullNode) []diff.Resource[*corev1.Service
 				TargetPort: intstr.FromString("p2p"),
 			},
 		}
-		svc.Spec.Selector = map[string]string{kube.InstanceLabel: instanceName(crd, ordinal)}
+		svc.Spec.Selector = map[string]string{kube.InstanceLabel: instanceName(crd, i)}
 
 		if i < maxExternal {
 			preserveMergeInto(svc.Labels, crd.Spec.Service.P2PTemplate.Metadata.Labels)