[Bugfix] Change Accepted Spec Propagation (#1642)

ajanikow · web-flow · commit 2fc8638b1331 · 2024-04-08T13:33:34.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - (Feature) Object Checksum
 - (Bugfix) Use Rendered Spec in case of scheduling compare
 - (Feature) Parametrize Scheduling Graceful Duration
+- (Bugfix) Change Accepted Spec Propagation
 
 ## [1.2.39](https://github.com/arangodb/kube-arangodb/tree/1.2.39) (2024-03-11)
 - (Feature) Extract Scheduler API
diff --git a/pkg/deployment/deployment.go b/pkg/deployment/deployment.go
@@ -498,8 +498,12 @@ func (d *Deployment) acceptNewSpec(ctx context.Context, depl *api.ArangoDeployme
 }
 
 func (d *Deployment) patchAcceptedSpec(ctx context.Context, spec *api.DeploymentSpec, checksum string) error {
-	return d.ApplyPatch(ctx, patch.ItemReplace(patch.NewPath("status", "accepted-spec"), spec),
-		patch.ItemReplace(patch.NewPath("status", "acceptedSpecVersion"), checksum))
+	s := d.GetStatus()
+
+	s.AcceptedSpecVersion = util.NewType(checksum)
+	s.AcceptedSpec = spec.DeepCopy()
+
+	return d.updateCRStatus(ctx, s)
 }
 
 // handleArangoDeploymentUpdatedEvent is called when the deployment is updated by the user.

Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,12 @@ func (d Deployment) acceptNewSpec(ctx context.Context, depl api.ArangoDeployme`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`func (d Deployment) patchAcceptedSpec(ctx context.Context, spec api.DeploymentSpec, checksum string) error {`
`501`		`- return d.ApplyPatch(ctx, patch.ItemReplace(patch.NewPath("status", "accepted-spec"), spec),`
`502`		`- patch.ItemReplace(patch.NewPath("status", "acceptedSpecVersion"), checksum))`
	`501`	`+ s := d.GetStatus()`
	`502`	`+`
	`503`	`+ s.AcceptedSpecVersion = util.NewType(checksum)`
	`504`	`+ s.AcceptedSpec = spec.DeepCopy()`
	`505`	`+`
	`506`	`+ return d.updateCRStatus(ctx, s)`
`503`	`507`	`}`
`504`	`508`
`505`	`509`	`// handleArangoDeploymentUpdatedEvent is called when the deployment is updated by the user.`