From a8e3e7ca2f2b06fec576124d432dc3e6074a4133 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 2 Dec 2025 12:21:22 -0500 Subject: [PATCH 1/2] Change override order for CB --- internal/controller/coinbase_deployment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/coinbase_deployment.go b/internal/controller/coinbase_deployment.go index fc7ad4b..506f4f5 100644 --- 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 } From 9d5170c8704e9997d45ef0ca46596f8f985a1cc9 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 2 Dec 2025 12:35:41 -0500 Subject: [PATCH 2/2] Fix merge conflict --- internal/utils/deployment.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/utils/deployment.go b/internal/utils/deployment.go index a15d3e7..9496559 100644 --- 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 } }