Change override order for CB (#29)

galt-tr · web-flow · commit 389ecf1d8bc7 · 2025-12-02T12:40:29.000-05:00
* Change override order for CB

* Fix merge conflict
diff --git a/internal/controller/coinbase_deployment.go b/internal/controller/coinbase_deployment.go
@@ -42,8 +42,8 @@ func (r *CoinbaseReconciler) updateDeployment(dep *appsv1.Deployment, coinbase *
 		return err
 	}
 	dep.Spec = *defaultCoinbaseDeploymentSpec()
-	utils.SetDeploymentOverrides(r.Client, dep, coinbase)
 	utils.SetClusterOverrides(r.Client, dep, coinbase)
+	utils.SetDeploymentOverrides(r.Client, dep, coinbase)
 
 	return nil
 }
diff --git a/internal/utils/deployment.go b/internal/utils/deployment.go
@@ -116,9 +116,9 @@ func SetDeploymentOverridesWithContext(ctx context.Context, log logr.Logger, cli
 	}
 	if len(cr.DeploymentOverrides().VolumeMounts) > 0 {
 		dep.Spec.Template.Spec.Containers[0].VolumeMounts = append(dep.Spec.Template.Spec.Containers[0].VolumeMounts, cr.DeploymentOverrides().VolumeMounts...)
-		if cr.DeploymentOverrides().Replicas != nil {
-			dep.Spec.Replicas = cr.DeploymentOverrides().Replicas
-		}
+	}
+	if cr.DeploymentOverrides().Replicas != nil {
+		dep.Spec.Replicas = cr.DeploymentOverrides().Replicas
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@ func (r CoinbaseReconciler) updateDeployment(dep appsv1.Deployment, coinbase *`
`42`	`42`	`return err`
`43`	`43`	`}`
`44`	`44`	`dep.Spec = *defaultCoinbaseDeploymentSpec()`
`45`		`- utils.SetDeploymentOverrides(r.Client, dep, coinbase)`
`46`	`45`	`utils.SetClusterOverrides(r.Client, dep, coinbase)`
	`46`	`+ utils.SetDeploymentOverrides(r.Client, dep, coinbase)`
`47`	`47`
`48`	`48`	`return nil`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,9 +116,9 @@ func SetDeploymentOverridesWithContext(ctx context.Context, log logr.Logger, cli`
`116`	`116`	`}`
`117`	`117`	`if len(cr.DeploymentOverrides().VolumeMounts) > 0 {`
`118`	`118`	`dep.Spec.Template.Spec.Containers[0].VolumeMounts = append(dep.Spec.Template.Spec.Containers[0].VolumeMounts, cr.DeploymentOverrides().VolumeMounts...)`
`119`		`- if cr.DeploymentOverrides().Replicas != nil {`
`120`		`- dep.Spec.Replicas = cr.DeploymentOverrides().Replicas`
`121`		`- }`
	`119`	`+ }`
	`120`	`+ if cr.DeploymentOverrides().Replicas != nil {`
	`121`	`+ dep.Spec.Replicas = cr.DeploymentOverrides().Replicas`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`