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 c433b907289f71c5f2639f90b281dc571594ce09
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Fri Jun 7 15:02:05 2019 +0200
Fix findings #206
---
deploy/crd-integration-kit.yaml | 2 +-
pkg/trait/trait.go | 2 +-
pkg/util/cancellable/cancellable.go | 2 +-
pkg/util/maven/maven_types.go | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deploy/crd-integration-kit.yaml b/deploy/crd-integration-kit.yaml
index f117dec..04f3e81 100644
--- a/deploy/crd-integration-kit.yaml
+++ b/deploy/crd-integration-kit.yaml
@@ -33,7 +33,7 @@ spec:
plural: integrationkits
singular: integrationkit
shortNames:
- - itk
+ - ik
additionalPrinterColumns:
- name: Phase
type: string
diff --git a/pkg/trait/trait.go b/pkg/trait/trait.go
index 96cb15f..aa186a0 100644
--- a/pkg/trait/trait.go
+++ b/pkg/trait/trait.go
@@ -56,7 +56,7 @@ func Apply(ctx context.Context, c client.Client, integration
*v1alpha1.Integrati
// newEnvironment creates a Environment from the given data
func newEnvironment(ctx context.Context, c client.Client, integration
*v1alpha1.Integration, kit *v1alpha1.IntegrationKit) (*Environment, error) {
if integration == nil && ctx == nil {
- return nil, errors.New("neither integration nor kit are ste")
+ return nil, errors.New("neither integration nor kit are set")
}
namespace := ""
diff --git a/pkg/util/cancellable/cancellable.go
b/pkg/util/cancellable/cancellable.go
index 41f478f..3e90d31 100644
--- a/pkg/util/cancellable/cancellable.go
+++ b/pkg/util/cancellable/cancellable.go
@@ -19,7 +19,7 @@ package cancellable
import "context"
-// Kit --
+// Context --
type Context interface {
context.Context
diff --git a/pkg/util/maven/maven_types.go b/pkg/util/maven/maven_types.go
index 969a69a..24ff0a3 100644
--- a/pkg/util/maven/maven_types.go
+++ b/pkg/util/maven/maven_types.go
@@ -98,7 +98,7 @@ func NewContext(buildDir string, project Project) Context {
}
}
-// Kit --
+// Context --
type Context struct {
Path string
Project Project
