You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dj...@apache.org on 2022/01/31 18:30:04 UTC
[camel-k] branch main updated (0c815fd -> 7adbc42)
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from 0c815fd update templates to use exposed sanitizeId function
new 0af1f4f kamelets always use own RawMessage
new 91f08d6 move Template to Kamelets
new 6d26169 tweak other pkg: disable flow>template conversion in kamelet trait
new e1474f3 re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors
new d2d408d generated comment change ???
new 7adbc42 generated change in pkg/resources/resources.go
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 1 +
.../strimzi/duck/v1beta2/zz_generated.deepcopy.go | 1 +
pkg/apis/camel/v1/common_types.go | 6 ++---
pkg/apis/camel/v1/zz_generated.deepcopy.go | 21 +--------------
pkg/apis/camel/v1alpha1/error_handler_types.go | 8 +++---
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
pkg/apis/camel/v1alpha1/kamelet_types.go | 7 ++++-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 31 ++++++++++++++++++----
pkg/cmd/bind.go | 2 +-
pkg/controller/kameletbinding/error_handler.go | 5 ++--
pkg/resources/resources.go | 8 +++---
pkg/trait/kamelets.go | 6 +++--
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
14 files changed, 55 insertions(+), 47 deletions(-)
[camel-k] 04/06: re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e1474f3d0f10132bc6894ead0420e0d236d2c52a
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jan 26 18:31:55 2022 -0800
re-enable Flow >> Template conversion, fix v1/v1alpha1.RawMessage type errors
---
pkg/cmd/bind.go | 2 +-
pkg/controller/kameletbinding/error_handler.go | 5 ++---
pkg/trait/kamelets.go | 15 ++++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pkg/cmd/bind.go b/pkg/cmd/bind.go
index b81d49d..4e581ce 100644
--- a/pkg/cmd/bind.go
+++ b/pkg/cmd/bind.go
@@ -343,7 +343,7 @@ func (o *bindCmdOptions) asEndpointProperties(props map[string]string) (*v1alpha
return nil, err
}
return &v1alpha1.EndpointProperties{
- RawMessage: v1.RawMessage(data),
+ RawMessage: v1alpha1.RawMessage(data),
}, nil
}
diff --git a/pkg/controller/kameletbinding/error_handler.go b/pkg/controller/kameletbinding/error_handler.go
index 48f1639..f7dc600 100644
--- a/pkg/controller/kameletbinding/error_handler.go
+++ b/pkg/controller/kameletbinding/error_handler.go
@@ -21,7 +21,6 @@ import (
"encoding/json"
"fmt"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/util/bindings"
"github.com/pkg/errors"
@@ -57,8 +56,8 @@ func maybeErrorHandler(errHandlConf *v1alpha1.ErrorHandlerSpec, bindingContext b
return nil, nil
}
-func parseErrorHandler(rawMessage v1.RawMessage) (v1alpha1.ErrorHandler, error) {
- var properties map[v1alpha1.ErrorHandlerType]v1.RawMessage
+func parseErrorHandler(rawMessage v1alpha1.RawMessage) (v1alpha1.ErrorHandler, error) {
+ var properties map[v1alpha1.ErrorHandlerType]v1alpha1.RawMessage
err := json.Unmarshal(rawMessage, &properties)
if err != nil {
return nil, err
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 4d6cf4c..a5c1c93 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,13 +257,14 @@ func (t *kameletsTrait) addKameletAsSource(e *Environment, kamelet *v1alpha1.Kam
// nolint: staticcheck
if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
template := kamelet.Spec.Template
- //if template == nil {
- // // Backward compatibility with Kamelets using flow
- // var bytes []byte = kamelet.Spec.Flow.RawMessage
- // template = &v1alpha1.Template{
- // RawMessage: v1alpha1.RawMessage{bytes},
- // }
- //}
+ if template == nil {
+ // Backward compatibility with Kamelets using flow
+ var bytes []byte = kamelet.Spec.Flow.RawMessage
+ template = &v1alpha1.Template{
+ RawMessage: make(v1alpha1.RawMessage, len(bytes)),
+ }
+ copy(template.RawMessage, bytes)
+ }
flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
if err != nil {
return err
[camel-k] 03/06: tweak other pkg: disable flow>template conversion in kamelet trait
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6d2616909c3830337a590627e644276ff476375b
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jan 26 18:01:25 2022 -0800
tweak other pkg: disable flow>template conversion in kamelet trait
---
pkg/apis/camel/v1alpha1/error_handler_types.go | 2 --
pkg/trait/kamelets.go | 13 +++++++------
pkg/util/dsl/template.go | 2 +-
pkg/util/dsl/template_test.go | 2 +-
4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go
index 987f1f7..7f24605 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -19,8 +19,6 @@ package v1alpha1
import (
"encoding/json"
-
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
)
// ErrorHandlerRefName --
diff --git a/pkg/trait/kamelets.go b/pkg/trait/kamelets.go
index 06d2122..4d6cf4c 100644
--- a/pkg/trait/kamelets.go
+++ b/pkg/trait/kamelets.go
@@ -257,12 +257,13 @@ func (t *kameletsTrait) addKameletAsSource(e *Environment, kamelet *v1alpha1.Kam
// nolint: staticcheck
if kamelet.Spec.Template != nil || kamelet.Spec.Flow != nil {
template := kamelet.Spec.Template
- if template == nil {
- // Backward compatibility with Kamelets using flow
- template = &v1.Template{
- RawMessage: kamelet.Spec.Flow.RawMessage,
- }
- }
+ //if template == nil {
+ // // Backward compatibility with Kamelets using flow
+ // var bytes []byte = kamelet.Spec.Flow.RawMessage
+ // template = &v1alpha1.Template{
+ // RawMessage: v1alpha1.RawMessage{bytes},
+ // }
+ //}
flowData, err := dsl.TemplateToYamlDSL(*template, kamelet.Name)
if err != nil {
return err
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 5f83ca3..7862aae 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -23,7 +23,7 @@ import (
yaml2 "gopkg.in/yaml.v2"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
)
// TemplateToYamlDSL converts a kamelet template into its Camel YAML DSL equivalent.
diff --git a/pkg/util/dsl/template_test.go b/pkg/util/dsl/template_test.go
index b2fb016..2098da2 100644
--- a/pkg/util/dsl/template_test.go
+++ b/pkg/util/dsl/template_test.go
@@ -20,7 +20,7 @@ package dsl
import (
"testing"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ v1 "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/stretchr/testify/assert"
)
[camel-k] 06/06: generated change in pkg/resources/resources.go
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 7adbc4266be83aed80bf977563932032577fabf3
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jan 26 18:41:28 2022 -0800
generated change in pkg/resources/resources.go
---
pkg/resources/resources.go | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 1ed2736..d58b3a0 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -152,16 +152,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 432720,
+ uncompressedSize: 432723,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x73\x1b\x37\x96\x30\xfa\x7b\xfe\x0a\x94\x9c\xfa\x24\x6d\x44\xca\xce\xcc\xce\xdd\xf1\x9d\xfa\x52\x1a\x59\xce\xe8\xc6\x96\x59\x96\xe2\x7c\x29\x27\x9b\x05\xbb\x41\x12\xab\x6e\xa0\x17\x40\x53\xe2\x5e\xdf\xff\xfd\x16\x0e\x80\x7e\xf0\x25\x9c\xa6\xa8\x28\x3b\x8d\xa9\x9a\x98\x22\xfb\x34\x5e\xe7\xfd\x7a\x41\x06\x8f\x37\xbe\x7a\x41\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\xce\x0a\x9a\xcc\x18\xb9\x96\x13\x73\x47\x [...]
},
"/crd/bases/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
modTime: time.Time{},
- uncompressedSize: 24280,
+ uncompressedSize: 24282,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x53\xe3\x38\x9a\xff\x3f\x9f\xe2\x29\x98\xaa\xa6\xab\x70\x48\x08\x30\xdd\xb9\x3f\x28\x06\x9a\xbd\xdc\xd0\x40\x11\xd8\xbd\x39\xe8\xad\x52\xec\x27\x89\x16\x5b\xf2\x4a\x32\x2f\x3b\xf0\xdd\xaf\x24\xd9\x8e\xf3\x62\x5b\x09\x81\xed\xba\x3a\x55\x4d\x0d\x76\xa4\x9f\x9e\x37\x3d\x7a\xfb\xb5\x37\xc1\x5b\x5f\x69\x6c\xc2\x19\xf5\x91\x49\x0c\x40\x71\x50\x63\x84\xa3\x98\xf8\x63\x84\x3e\x1f\xaa\x47\x22\x10\x4e\x79\xc2\x02\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7b\x53\xeb\x38\x96\xff\x3f\x9f\xe2\x14\x74\xd5\x85\x2a\x1c\x12\x02\xf4\xed\xec\x1f\x14\x0d\x97\xd9\x6c\xd3\x40\x11\x98\xd9\x5e\xb8\x53\xa5\xd8\x27\x89\x06\x5b\xf2\x48\x32\x8f\x69\xf8\xee\x5b\x92\x6c\xc7\x79\xd8\x56\x42\x60\x6e\x6d\xad\xaa\xba\x1a\x3b\xd2\x4f\xe7\xa5\xa3\xd7\xef\x7a\x13\xbc\xf5\x95\xc6\x26\x9c\x53\x1f\x99\xc4\x00\x14\x07\x35\x46\x38\x8e\x89\x3f\x46\xe8\xf3\xa1\x7a\x22\x02\xe1\x8c\x27\x2c\x20\x [...]
},
"/manager": &vfsgen۰DirInfo{
name: "manager",
[camel-k] 05/06: generated comment change ???
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d2d408d6fdfe10c5dec92430371fb7d5a77adab8
Author: David Jencks <dj...@apache.org>
AuthorDate: Wed Jan 26 18:39:03 2022 -0800
generated comment change ???
---
addons/keda/duck/v1alpha1/zz_generated.deepcopy.go | 1 +
addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go | 1 +
2 files changed, 2 insertions(+)
diff --git a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
index 9762e39..7bbeb3f 100644
--- a/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
+++ b/addons/keda/duck/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
diff --git a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
index 6a7dd3b..3a04649 100644
--- a/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
+++ b/addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
[camel-k] 02/06: move Template to Kamelets
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 91f08d66addaaf0e6c9ee02addb1a18430b2f945
Author: David Jencks <dj...@apache.org>
AuthorDate: Tue Jan 25 23:21:32 2022 -0800
move Template to Kamelets
---
pkg/apis/camel/v1/common_types.go | 6 +++---
pkg/apis/camel/v1/zz_generated.deepcopy.go | 20 --------------------
pkg/apis/camel/v1alpha1/kamelet_types.go | 7 ++++++-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 22 +++++++++++++++++++++-
4 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/pkg/apis/camel/v1/common_types.go b/pkg/apis/camel/v1/common_types.go
index 5826a06..6b97918 100644
--- a/pkg/apis/camel/v1/common_types.go
+++ b/pkg/apis/camel/v1/common_types.go
@@ -175,9 +175,9 @@ type Flow struct {
}
// Template is an unstructured object representing a Kamelet template in YAML/JSON DSL
-type Template struct {
- RawMessage `json:",inline"`
-}
+//type Template struct {
+// RawMessage `json:",inline"`
+//}
// RuntimeProvider --
type RuntimeProvider string
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index 76fa84a..69ddb11 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1618,26 +1618,6 @@ func (in *Task) DeepCopy() *Task {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Template) DeepCopyInto(out *Template) {
- *out = *in
- if in.RawMessage != nil {
- in, out := &in.RawMessage, &out.RawMessage
- *out = make(RawMessage, len(*in))
- copy(*out, *in)
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Template.
-func (in *Template) DeepCopy() *Template {
- if in == nil {
- return nil
- }
- out := new(Template)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *TraitConfiguration) DeepCopyInto(out *TraitConfiguration) {
*out = *in
if in.RawMessage != nil {
diff --git a/pkg/apis/camel/v1alpha1/kamelet_types.go b/pkg/apis/camel/v1alpha1/kamelet_types.go
index 5674c2f..63895e0 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_types.go
@@ -45,7 +45,7 @@ var (
type KameletSpec struct {
Definition *JSONSchemaProps `json:"definition,omitempty"`
Sources []camelv1.SourceSpec `json:"sources,omitempty"`
- Template *camelv1.Template `json:"template,omitempty"`
+ Template *Template `json:"template,omitempty"`
// Deprecated: use template
Flow *camelv1.Flow `json:"flow,omitempty"`
Authorization *AuthorizationSpec `json:"authorization,omitempty"`
@@ -53,6 +53,11 @@ type KameletSpec struct {
Dependencies []string `json:"dependencies,omitempty"`
}
+// Template is an unstructured object representing a Kamelet template in YAML/JSON DSL
+type Template struct {
+ RawMessage `json:",inline"`
+}
+
type EventTypeSpec struct {
MediaType string `json:"mediaType,omitempty"`
Schema *JSONSchemaProps `json:"schema,omitempty"`
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index e6ec185..e760a6b 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -626,7 +626,7 @@ func (in *KameletSpec) DeepCopyInto(out *KameletSpec) {
}
if in.Template != nil {
in, out := &in.Template, &out.Template
- *out = new(v1.Template)
+ *out = new(Template)
(*in).DeepCopyInto(*out)
}
if in.Flow != nil {
@@ -708,3 +708,23 @@ func (in RawMessage) DeepCopy() RawMessage {
in.DeepCopyInto(out)
return *out
}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Template) DeepCopyInto(out *Template) {
+ *out = *in
+ if in.RawMessage != nil {
+ in, out := &in.RawMessage, &out.RawMessage
+ *out = make(RawMessage, len(*in))
+ copy(*out, *in)
+ }
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Template.
+func (in *Template) DeepCopy() *Template {
+ if in == nil {
+ return nil
+ }
+ out := new(Template)
+ in.DeepCopyInto(out)
+ return out
+}
[camel-k] 01/06: kamelets always use own RawMessage
Posted by dj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
djencks pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 0af1f4f34455f3bd19a1561fd512d4843d07b41d
Author: David Jencks <dj...@apache.org>
AuthorDate: Tue Jan 25 23:15:01 2022 -0800
kamelets always use own RawMessage
---
pkg/apis/camel/v1/zz_generated.deepcopy.go | 1 +
pkg/apis/camel/v1alpha1/error_handler_types.go | 6 +++---
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 2 +-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 9 +++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index ba10726..76fa84a 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
diff --git a/pkg/apis/camel/v1alpha1/error_handler_types.go b/pkg/apis/camel/v1alpha1/error_handler_types.go
index af038cb..987f1f7 100644
--- a/pkg/apis/camel/v1alpha1/error_handler_types.go
+++ b/pkg/apis/camel/v1alpha1/error_handler_types.go
@@ -34,17 +34,17 @@ const ErrorHandlerAppPropertiesPrefix = "camel.beans.defaultErrorHandler"
// ErrorHandlerSpec represents an unstructured object for an error handler
type ErrorHandlerSpec struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// ErrorHandlerParameters represent an unstructured object for error handler parameters
type ErrorHandlerParameters struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// BeanProperties represent an unstructured object properties to be set on a bean
type BeanProperties struct {
- v1.RawMessage `json:",omitempty"`
+ RawMessage `json:",omitempty"`
}
// +kubebuilder:object:generate=false
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index a0c52c4..d06e028 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -63,7 +63,7 @@ const (
// EndpointProperties is a key/value struct represented as JSON raw to allow numeric/boolean values
type EndpointProperties struct {
- v1.RawMessage `json:",inline"`
+ RawMessage `json:",inline"`
}
// KameletBindingStatus --
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index a5c99f3..e6ec185 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
// +build !ignore_autogenerated
// Code generated by controller-gen. DO NOT EDIT.
@@ -31,7 +32,7 @@ func (in *BeanProperties) DeepCopyInto(out *BeanProperties) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -88,7 +89,7 @@ func (in *EndpointProperties) DeepCopyInto(out *EndpointProperties) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -145,7 +146,7 @@ func (in *ErrorHandlerParameters) DeepCopyInto(out *ErrorHandlerParameters) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}
@@ -186,7 +187,7 @@ func (in *ErrorHandlerSpec) DeepCopyInto(out *ErrorHandlerSpec) {
*out = *in
if in.RawMessage != nil {
in, out := &in.RawMessage, &out.RawMessage
- *out = make(v1.RawMessage, len(*in))
+ *out = make(RawMessage, len(*in))
copy(*out, *in)
}
}