[camel-k] 02/13: chore(replicas): Use JSON merge patch to update deployment replicas

[as...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 940746c0ed94f6a6caa52892d8df7b5a5fe1e656
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Nov 22 14:03:17 2019 +0100

    chore(replicas): Use JSON merge patch to update deployment replicas
---
 pkg/trait/deployment.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkg/trait/deployment.go b/pkg/trait/deployment.go
index daf3f09..29f8b52 100644
--- a/pkg/trait/deployment.go
+++ b/pkg/trait/deployment.go
@@ -137,8 +137,9 @@ func (t *deploymentTrait) Apply(e *Environment) error {
 		// back to that default value by the Deployment controller.
 		if replicas == nil && *deployment.Spec.Replicas != 1 ||
 			replicas != nil && *deployment.Spec.Replicas != *replicas {
-			deployment.Spec.Replicas = replicas
-			err := t.client.Update(context.TODO(), deployment)
+			target := deployment.DeepCopy()
+			target.Spec.Replicas = replicas
+			err := t.client.Patch(context.TODO(), target, client.MergeFrom(deployment))
 			if err != nil {
 				return err
 			}