[camel-k] 06/14: #1199: fix lint

[lb...@apache.org]

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

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

commit 622d0a78b5b8606b3b33c4426a4741922bf95f7e
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Jan 28 01:27:58 2020 +0100

    #1199: fix lint
---
 pkg/cmd/install.go                                                   | 1 +
 pkg/cmd/run.go                                                       | 1 +
 pkg/controller/integrationplatform/integrationplatform_controller.go | 4 ++--
 pkg/event/manager.go                                                 | 1 +
 pkg/util/watch/watch.go                                              | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkg/cmd/install.go b/pkg/cmd/install.go
index 248d7d7..183f32b 100644
--- a/pkg/cmd/install.go
+++ b/pkg/cmd/install.go
@@ -418,6 +418,7 @@ func (o *installCmdOptions) printOutput(collection *kubernetes.Collection) error
 	return nil
 }
 
+// nolint:errcheck
 func (o *installCmdOptions) waitForPlatformReady(cmd *cobra.Command, platform *v1.IntegrationPlatform) error {
 	handler := func(i *v1.IntegrationPlatform) bool {
 		if i.Status.Phase == v1.IntegrationPlatformPhaseReady || i.Status.Phase == v1.IntegrationPlatformPhaseError {
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index bb7b6f3..e6dee28 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -297,6 +297,7 @@ func (o *runCmdOptions) run(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
+// nolint:errcheck
 func (o *runCmdOptions) waitForIntegrationReady(cmd *cobra.Command, integration *v1.Integration) (*v1.IntegrationPhase, error) {
 	handler := func(i *v1.Integration) bool {
 		//
diff --git a/pkg/controller/integrationplatform/integrationplatform_controller.go b/pkg/controller/integrationplatform/integrationplatform_controller.go
index 0f8668a..6412ba7 100644
--- a/pkg/controller/integrationplatform/integrationplatform_controller.go
+++ b/pkg/controller/integrationplatform/integrationplatform_controller.go
@@ -52,8 +52,8 @@ func Add(mgr manager.Manager) error {
 // newReconciler returns a new reconcile.Reconciler
 func newReconciler(mgr manager.Manager, c client.Client) reconcile.Reconciler {
 	return &ReconcileIntegrationPlatform{
-		client: c,
-		scheme: mgr.GetScheme(),
+		client:   c,
+		scheme:   mgr.GetScheme(),
 		recorder: mgr.GetEventRecorderFor("camel-k-integration-platform-controller"),
 	}
 }
diff --git a/pkg/event/manager.go b/pkg/event/manager.go
index 9e4869a..6b85b4c 100644
--- a/pkg/event/manager.go
+++ b/pkg/event/manager.go
@@ -180,6 +180,7 @@ func NotifyBuildError(ctx context.Context, c client.Client, recorder record.Even
 	recorder.Eventf(p, corev1.EventTypeWarning, ReasonBuildError, "Cannot reconcile Build %s: %v", p.Name, err)
 }
 
+// nolint:lll
 func notifyIfPhaseUpdated(ctx context.Context, c client.Client, recorder record.EventRecorder, new runtime.Object, oldPhase, newPhase string, resourceType, name, reason string) {
 	// Update information about phase changes
 	if oldPhase != newPhase {
diff --git a/pkg/util/watch/watch.go b/pkg/util/watch/watch.go
index 289fc12..5d2229c 100644
--- a/pkg/util/watch/watch.go
+++ b/pkg/util/watch/watch.go
@@ -159,7 +159,6 @@ func HandleIntegrationEvents(ctx context.Context, integration *v1.Integration,
 	}
 }
 
-
 //
 // HandlePlatformStateChanges watches a platform resource and invoke the given handler when its status changes.
 //