You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2019/02/25 11:08:25 UTC
[camel-k] branch master updated: Do not swallow error returned by
controller actions
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
The following commit(s) were added to refs/heads/master by this push:
new cfbb5f8 Do not swallow error returned by controller actions
cfbb5f8 is described below
commit cfbb5f88ab52cdedeb2003fcf4f20a0651628696
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Feb 25 11:56:09 2019 +0100
Do not swallow error returned by controller actions
---
pkg/controller/integration/integration_controller.go | 2 +-
pkg/controller/integrationcontext/integrationcontext_controller.go | 2 +-
pkg/controller/integrationplatform/integrationplatform_controller.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/controller/integration/integration_controller.go b/pkg/controller/integration/integration_controller.go
index bff5513..adf6c7d 100644
--- a/pkg/controller/integration/integration_controller.go
+++ b/pkg/controller/integration/integration_controller.go
@@ -139,7 +139,7 @@ func (r *ReconcileIntegration) Reconcile(request reconcile.Request) (reconcile.R
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}
diff --git a/pkg/controller/integrationcontext/integrationcontext_controller.go b/pkg/controller/integrationcontext/integrationcontext_controller.go
index f432539..cefb27b 100644
--- a/pkg/controller/integrationcontext/integrationcontext_controller.go
+++ b/pkg/controller/integrationcontext/integrationcontext_controller.go
@@ -126,7 +126,7 @@ func (r *ReconcileIntegrationContext) Reconcile(request reconcile.Request) (reco
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}
diff --git a/pkg/controller/integrationplatform/integrationplatform_controller.go b/pkg/controller/integrationplatform/integrationplatform_controller.go
index 385cad5..2960787 100644
--- a/pkg/controller/integrationplatform/integrationplatform_controller.go
+++ b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -126,7 +126,7 @@ func (r *ReconcileIntegrationPlatform) Reconcile(request reconcile.Request) (rec
}, nil
}
- return reconcile.Result{}, nil
+ return reconcile.Result{}, err
}
}
}