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 b9f5fb8e45c5e9518cc8ad9b010c7fc0ffa6870f
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Thu Jan 23 09:26:34 2020 +0100
chore: Fix IntegrationKit kind variable
---
pkg/apis/camel/v1/integrationkit_types.go | 4 ++--
pkg/apis/camel/v1/integrationkit_types_support.go | 4 ++--
pkg/builder/builder_steps_test.go | 4 ++--
pkg/controller/integration/util_test.go | 12 ++++++------
pkg/install/common.go | 2 +-
pkg/trait/jvm_test.go | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pkg/apis/camel/v1/integrationkit_types.go
b/pkg/apis/camel/v1/integrationkit_types.go
index 5f3c046..e80cc89 100644
--- a/pkg/apis/camel/v1/integrationkit_types.go
+++ b/pkg/apis/camel/v1/integrationkit_types.go
@@ -79,8 +79,8 @@ type IntegrationKitPhase string
type IntegrationKitConditionType string
const (
- // IntegrationKindKind --
- IntegrationKindKind string = "IntegrationKit"
+ // IntegrationKitKind --
+ IntegrationKitKind string = "IntegrationKit"
// IntegrationKitTypePlatform --
IntegrationKitTypePlatform = "platform"
diff --git a/pkg/apis/camel/v1/integrationkit_types_support.go
b/pkg/apis/camel/v1/integrationkit_types_support.go
index 9c78649..df3a95d 100644
--- a/pkg/apis/camel/v1/integrationkit_types_support.go
+++ b/pkg/apis/camel/v1/integrationkit_types_support.go
@@ -27,7 +27,7 @@ func NewIntegrationKit(namespace string, name string)
IntegrationKit {
return IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: IntegrationKindKind,
+ Kind: IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: namespace,
@@ -41,7 +41,7 @@ func NewIntegrationKitList() IntegrationKitList {
return IntegrationKitList{
TypeMeta: metav1.TypeMeta{
APIVersion: SchemeGroupVersion.String(),
- Kind: IntegrationKindKind,
+ Kind: IntegrationKitKind,
},
}
}
diff --git a/pkg/builder/builder_steps_test.go
b/pkg/builder/builder_steps_test.go
index 39c7ef2..a60744d 100644
--- a/pkg/builder/builder_steps_test.go
+++ b/pkg/builder/builder_steps_test.go
@@ -154,7 +154,7 @@ func TestListPublishedImages(t *testing.T) {
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -173,7 +173,7 @@ func TestListPublishedImages(t *testing.T) {
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
diff --git a/pkg/controller/integration/util_test.go
b/pkg/controller/integration/util_test.go
index d7efedc..3f32dc6 100644
--- a/pkg/controller/integration/util_test.go
+++ b/pkg/controller/integration/util_test.go
@@ -34,7 +34,7 @@ func TestLookupKitForIntegration_DiscardKitsInError(t
*testing.T) {
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -56,7 +56,7 @@ func TestLookupKitForIntegration_DiscardKitsInError(t
*testing.T) {
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -110,7 +110,7 @@ func
TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T)
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -148,7 +148,7 @@ func
TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T)
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -181,7 +181,7 @@ func
TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T)
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
@@ -224,7 +224,7 @@ func
TestLookupKitForIntegration_DiscardKitsWithIncompatibleTraits(t *testing.T)
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "ns",
diff --git a/pkg/install/common.go b/pkg/install/common.go
index 315c224..22fd6e7 100644
--- a/pkg/install/common.go
+++ b/pkg/install/common.go
@@ -95,7 +95,7 @@ func RuntimeObjectOrCollect(ctx context.Context, c
client.Client, namespace stri
return nil
}
// Don't recreate integration kits, platforms, etc
- if obj.GetObjectKind().GroupVersionKind().Kind ==
v1.IntegrationKindKind {
+ if obj.GetObjectKind().GroupVersionKind().Kind ==
v1.IntegrationKitKind {
return nil
}
if obj.GetObjectKind().GroupVersionKind().Kind ==
v1.IntegrationPlatformKind {
diff --git a/pkg/trait/jvm_test.go b/pkg/trait/jvm_test.go
index e480f06..57260db 100644
--- a/pkg/trait/jvm_test.go
+++ b/pkg/trait/jvm_test.go
@@ -150,7 +150,7 @@ func createJvmTestWithKitType(kitType string) (*jvmTrait,
*Environment) {
&v1.IntegrationKit{
TypeMeta: metav1.TypeMeta{
APIVersion: v1.SchemeGroupVersion.String(),
- Kind: v1.IntegrationKindKind,
+ Kind: v1.IntegrationKitKind,
},
ObjectMeta: metav1.ObjectMeta{
Namespace: "kit-namespace",
