[camel-k] 09/13: chore: Remove conflict checking as patch is now used instead of update

[astefanutti]

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 a3c3cf48556e03c54101c0c9b1ecde5a344f1766
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Tue Nov 26 15:37:31 2019 +0100

    chore: Remove conflict checking as patch is now used instead of update
---
 pkg/controller/integration/integration_controller.go | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkg/controller/integration/integration_controller.go 
b/pkg/controller/integration/integration_controller.go
index 3e28398..16849e8 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -19,8 +19,6 @@ package integration
 import (
        "context"
 
-       "github.com/pkg/errors"
-
        appsv1 "k8s.io/api/apps/v1"
        k8serrors "k8s.io/apimachinery/pkg/api/errors"
        "k8s.io/apimachinery/pkg/runtime"
@@ -280,16 +278,6 @@ func (r *ReconcileIntegration) Reconcile(request 
reconcile.Request) (reconcile.R
 
                        newTarget, err := a.Handle(ctx, target)
                        if err != nil {
-                               // Some traits, like the deployment and knative 
service ones,
-                               // update owned resources in the running phase, 
so it's better
-                               // handling update conflicts gracefully, 
consistently with the
-                               // primary integration update requests.
-                               if cause := errors.Cause(err); 
k8serrors.IsConflict(cause) {
-                                       log.Error(cause, "conflict")
-                                       return reconcile.Result{
-                                               Requeue: true,
-                                       }, nil
-                               }
                                return reconcile.Result{}, err
                        }