[camel-k] branch master updated: chore(lint): fix findings

[nferraro]

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

nferraro 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 bed7e20  chore(lint): fix findings
bed7e20 is described below

commit bed7e2073b90ec1939b08278963be3a183e590b1
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Sun Jun 23 22:00:13 2019 +0200

    chore(lint): fix findings
---
 pkg/builder/s2i/publisher.go | 1 +
 pkg/trait/camel.go           | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/builder/s2i/publisher.go b/pkg/builder/s2i/publisher.go
index d9b772b..61c9dd9 100644
--- a/pkg/builder/s2i/publisher.go
+++ b/pkg/builder/s2i/publisher.go
@@ -179,6 +179,7 @@ func publisher(ctx *builder.Context) error {
        return nil
 }
 
+//nolint: unparam
 func replaceHost(ctx *builder.Context) error {
        ctx.PublicImage = getImageWithOpenShiftHost(ctx.Image)
        return nil
diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go
index 67c71da..f5564e9 100644
--- a/pkg/trait/camel.go
+++ b/pkg/trait/camel.go
@@ -31,8 +31,7 @@ import (
        "github.com/apache/camel-k/pkg/util/maven"
        "github.com/pkg/errors"
 
-       "gopkg.in/yaml.v2"
-
+       yaml2 "gopkg.in/yaml.v2"
        k8serrors "k8s.io/apimachinery/pkg/api/errors"
 )
 
@@ -95,7 +94,7 @@ func (t *camelTrait) Apply(e *Environment) error {
                                cx.Labels["app"] = "camel-k"
                                cx.Labels["camel.apache.org/catalog.version"] = 
cv
                                
cx.Labels["camel.apache.org/catalog.loader.version"] = cv
-                               cx.Labels["camel.apache.org/catalog.generated"] 
= "true"
+                               cx.Labels["camel.apache.org/catalog.generated"] 
= True
 
                                err = e.Client.Create(e.C, &cx)
                                if err != nil && 
!k8serrors.IsAlreadyExists(err) {
@@ -171,7 +170,7 @@ func (t *camelTrait) GenerateCatalog(e *Environment, 
version string) (*camel.Run
        }
 
        catalog := v1alpha1.CamelCatalog{}
-       if err := yaml.Unmarshal(content, &catalog); err != nil {
+       if err := yaml2.Unmarshal(content, &catalog); err != nil {
                return nil, err
        }