You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/10/06 08:03:18 UTC
[camel-k] 07/08: chore(e2e): fix deepcopy and regen
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
commit 69bb64a766907d463ae5c933982dcaa395f5ea8c
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Mon Oct 5 17:20:00 2020 +0200
chore(e2e): fix deepcopy and regen
---
deploy/resources.go | 57 +-----------------------
go.mod | 1 +
pkg/apis/camel/v1alpha1/kamelet_binding_types.go | 6 +--
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 6 +--
pkg/client/camel/go.mod | 1 +
5 files changed, 10 insertions(+), 61 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index b6c4ef3..76daba7 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -112,9 +112,9 @@ var assets = func() http.FileSystem {
"/crd-build.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-build.yaml",
modTime: time.Time{},
- uncompressedSize: 301996,
+ uncompressedSize: 301790,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x73\x23\xb9\x91\x28\x0c\x7f\x9f\x5f\x81\xd0\x38\x42\xd2\x5a\xa4\xba\xbd\x5e\xaf\xdd\xde\xd8\x09\x4d\x4b\x3d\xab\xd7\x7d\xd1\x69\xaa\x67\xde\x13\x63\xaf\x03\xac\x02\x49\xac\xaa\x80\x1a\x00\x25\x35\x7d\x66\xff\xfb\x13\x48\x00\x75\xe1\xad\x12\x45\x4a\xad\x19\x17\xbe\x74\x8b\x64\x65\x01\x89\x44\x22\xef\xf9\x35\x19\x1d\x6e\x7c\xf5\x35\x79\xcb\x13\x26\x34\x4b\x89\x91\xc4\x2c\x18\xb9\x28\x68\xb2\x60\x64\x22\x67\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x6b\x73\x1b\x37\x96\x30\x8e\xbf\xcf\xa7\x40\x29\x53\x25\x69\x23\x52\xf6\x6c\x76\x76\x46\xb3\x35\x29\xc5\x92\x33\xfa\x27\xb6\xf5\x58\x72\xf2\x7f\x2a\x93\x9d\x02\xbb\x41\x12\xab\x6e\xa0\x03\xa0\x25\x73\x9e\xec\x77\xff\x15\x0e\x80\xbe\xf0\xd6\x07\x4d\x4a\x56\x92\xc6\x1b\x5b\x24\xfb\x34\x2e\x07\xe7\x7e\xf9\x9c\x8c\xf6\x37\x3e\xfb\x9c\x7c\xc7\x13\x26\x34\x4b\x89\x91\xc4\xcc\x19\x39\x2f\x68\x32\x67\xe4\x46\x4e\xcd\x [...]
},
"/crd-camel-catalog.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-camel-catalog.yaml",
@@ -158,59 +158,6 @@ var assets = func() http.FileSystem {
compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xd4\x7d\x6d\x73\xdb\xba\xb1\xff\x7b\x7f\x8a\x1d\xbb\x33\xb5\x67\x4c\x59\xf2\x43\x9a\xe8\xff\x22\xe3\x3a\x49\xff\xea\xc9\x89\x33\xb6\xd3\x4e\x6f\x7c\x3a\x81\xc8\x95\x84\x9a\x04\x58\x00\xb4\xad\x36\xf9\xee\x77\xf0\x40\x91\x92\x40\x90\x92\xed\x9c\xb9\x98\xc9\x44\xa4\x80\xc5\x62\xb1\xd8\x5d\x2c\xf0\xb3\xf6\x20\x7a\xbe\xb2\xb3\x07\x1f\x69\x8c\x4c\x62\x02\x8a\x83\x9a\x21\x9c\xe7\x24\x9e\x21\x5c\xf3\x89\x7a\x20\x02\xe1\x03\x [...]
},
- "/crds": &vfsgen۰DirInfo{
- name: "crds",
- modTime: time.Time{},
- },
- "/crds/camel.apache.org_builds.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_builds.yaml",
- modTime: time.Time{},
- uncompressedSize: 301128,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xeb\x72\x23\x37\x92\x30\xfa\x7f\x9e\x02\xa1\x99\x08\x49\x6b\x91\xea\x9e\xf5\xce\xce\xf4\x6e\x8c\x43\x6e\xa9\x3d\x3a\xee\x8b\xbe\x56\xb7\x7d\x4e\x78\xbc\x13\x60\x15\x48\x62\x54\x05\x94\x01\x94\xd4\x9c\xcf\xfb\xee\x27\x90\x00\xea\xc2\x5b\x25\x8a\xa4\x5a\xb6\x0b\x7f\xba\x45\xb2\xb2\x80\x44\x22\x91\xf7\xfc\xdd\x68\x34\xfa\x1d\x2d\xf8\x77\x4c\x69\x2e\xc5\x0b\x42\x0b\xce\x3e\x19\x26\xec\x5f\x7a\x7c\xf7\x67\x3d\xe6\x [...]
- },
- "/crds/camel.apache.org_camelcatalogs.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_camelcatalogs.yaml",
- modTime: time.Time{},
- uncompressedSize: 8416,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\xcd\x72\xdb\x38\x12\xbe\xeb\x29\xba\xb2\x87\x5c\x96\x94\xec\x6c\x52\x89\x6e\x29\x25\x07\x6f\x7e\xd6\x15\xbb\x7c\x6f\x81\x2d\x09\x31\x09\x60\x01\x50\x15\xcf\xd4\xbc\xfb\x14\x00\x52\x22\x25\x92\x40\x12\x27\x99\xa9\x1a\x9c\x44\xa0\xd9\x3f\x5f\xf7\xd7\x04\x84\x59\x96\x65\x33\x54\xfc\x8e\xb4\xe1\x52\x2c\x01\x15\xa7\x2f\x96\x84\x7b\x32\xf9\xfd\x4b\x93\x73\x39\xdf\x5f\xac\xc9\xe2\xc5\xec\x9e\x8b\x62\x09\xab\xda\x58\x [...]
- },
- "/crds/camel.apache.org_integrationkits.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_integrationkits.yaml",
- modTime: time.Time{},
- uncompressedSize: 6536,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x59\x4d\x73\xdb\xbc\x11\xbe\xeb\x57\xec\xbc\x3d\xe4\x12\x52\xb6\xd3\x64\x12\xdd\x3c\x6e\x33\xe3\xe6\xa3\x1e\xdb\xc9\xc9\x97\x25\xb8\x92\x50\x81\x00\x0b\x2c\x95\xb8\x9d\xfe\xf7\x0e\x00\x92\x22\x45\x52\x96\x94\x37\x3a\x19\xc0\x62\xf7\xd9\x07\xfb\x01\xc2\xb3\x24\x49\x66\x58\xca\xef\x64\x9d\x34\x7a\x01\x58\x4a\xfa\xc9\xa4\xfd\xc8\xa5\x9b\xf7\x2e\x95\x66\xbe\xbd\xcc\x88\xf1\x72\xb6\x91\x3a\x5f\xc0\x4d\xe5\xd8\x14\xf7\x [...]
- },
- "/crds/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_integrationplatforms.yaml",
- modTime: time.Time{},
- uncompressedSize: 14137,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5b\x4f\x73\xeb\xb6\x11\xbf\xeb\x53\xec\x24\x07\x5f\x4c\xc9\xcf\x69\x32\x89\x2e\x9d\x57\xa5\x9d\x71\x93\x97\xa7\xb1\x1d\xdf\x57\xe4\x4a\x42\x05\x02\x2c\x16\x94\xa3\x74\xfa\xdd\x3b\x00\x48\x8a\x94\x40\x49\x96\x9b\x76\x92\x21\x2e\x12\x49\xec\xe2\xb7\x8b\xfd\xc7\x25\x39\x4a\x92\x64\x84\x85\x78\x21\xc3\x42\xab\x29\x60\x21\xe8\x17\x4b\xca\x1d\xf1\x78\xf3\x2d\x8f\x85\x9e\x6c\x3f\x2c\xc8\xe2\x87\xd1\x46\xa8\x6c\x0a\xb3\x [...]
- },
- "/crds/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_integrations.yaml",
- modTime: time.Time{},
- uncompressedSize: 11598,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x1a\xcb\x72\xe3\xb8\xf1\xae\xaf\xe8\x9a\x1c\x26\xa9\x1a\x4a\x1e\x4f\x66\x6b\x57\x37\x97\x93\xad\x72\xe6\x11\x97\xed\x9d\x7b\x13\x68\x4a\x88\x41\x80\x01\x40\x79\x9c\x54\xfe\x3d\x05\x80\x14\x1f\x22\x65\x8a\x9e\xcd\x21\x25\x9c\x04\x10\x8d\x7e\xa2\x5f\xc2\x22\x49\x92\x05\x16\xe2\x1b\x19\x2b\xb4\x5a\x03\x16\x82\xbe\x3b\x52\x7e\x66\x97\x8f\x3f\xdb\xa5\xd0\xab\xdd\xfb\x94\x1c\xbe\x5f\x3c\x0a\xc5\xd7\x70\x5d\x5a\xa7\xf3\x [...]
- },
- "/crds/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_kameletbindings.yaml",
- modTime: time.Time{},
- uncompressedSize: 12192,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\xcd\x72\xe3\x36\x12\xbe\xeb\x29\xba\x9c\xc3\x4c\xaa\x4c\xca\xf6\x64\x52\x89\x6e\x5e\x3b\x5b\xe5\x9d\xd9\x89\xcb\x3f\x73\x6f\x02\x4d\x09\x2b\x10\xe0\x02\xa0\x1d\x65\x6b\xdf\x3d\x05\x80\xa4\x28\x89\xa4\x64\x6b\xa6\x72\x31\x4f\x12\x01\x34\xfa\xbf\x3f\x34\x31\x49\x92\x64\x82\xa5\xf8\x4a\xc6\x0a\xad\x66\x80\xa5\xa0\x3f\x1c\x29\xff\xcf\xa6\xcb\x5f\x6c\x2a\xf4\xf4\xe9\x3c\x23\x87\xe7\x93\xa5\x50\x7c\x06\x57\x95\x75\x [...]
- },
- "/crds/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{
- name: "camel.apache.org_kamelets.yaml",
- modTime: time.Time{},
- uncompressedSize: 31119,
-
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xdc\x5d\x6f\x6f\xdb\x38\xd2\x7f\xdf\x4f\x31\xc8\x2d\xb0\x09\x10\x39\x76\x9c\x74\x5b\xbf\x29\xb2\xed\xf6\x90\x67\xb7\xdb\x20\x49\xf7\xc5\xd3\xf4\x50\x5a\x1a\xdb\xbc\x48\xa4\x8e\xa4\x92\x78\xaf\xfd\xee\x0f\xf8\x47\xb6\x6c\x93\x94\xec\x24\x7b\x78\x8e\xc0\x62\x23\x99\x1c\x0e\x87\xc3\x99\xe1\x90\xbf\xea\x45\x92\x24\x2f\x48\x49\xff\x40\x21\x29\x67\x23\x20\x25\xc5\x07\x85\x4c\x3f\xc9\xde\xed\x2b\xd9\xa3\xfc\xe8\x6e\x30\x46\x [...]
- },
"/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{
name: "operator-deployment.yaml",
modTime: time.Time{},
diff --git a/go.mod b/go.mod
index 3f22a24..e101e31 100644
--- a/go.mod
+++ b/go.mod
@@ -56,6 +56,7 @@ replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.17.6
k8s.io/client-go => k8s.io/client-go v0.17.6
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.11
+ k8s.io/code-generator => k8s.io/code-generator v0.17.6
)
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
diff --git a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
index 4214074..b1cc853 100644
--- a/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
+++ b/pkg/apis/camel/v1alpha1/kamelet_binding_types.go
@@ -105,13 +105,13 @@ const (
KameletBindingPhaseReady KameletBindingPhase = "Ready"
)
-// KameletBinding is the Schema for the kamelets binding API
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +k8s:openapi-gen=true
+// +kubebuilder:object:root=true
// +genclient
// +kubebuilder:resource:path=kameletbindings,scope=Namespaced,shortName=klb,categories=kamel;camel
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`,description="The Kamelet Binding phase"
+
+// KameletBinding is the Schema for the kamelets binding API
type KameletBinding struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 5f5082b..2601efc 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -7,7 +7,7 @@ package v1alpha1
import (
"encoding/json"
"github.com/apache/camel-k/pkg/apis/camel/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
)
@@ -31,8 +31,8 @@ func (in *Endpoint) DeepCopyInto(out *Endpoint) {
*out = *in
if in.Ref != nil {
in, out := &in.Ref, &out.Ref
- *out = new(metav1.OwnerReference)
- (*in).DeepCopyInto(*out)
+ *out = new(corev1.ObjectReference)
+ **out = **in
}
if in.URI != nil {
in, out := &in.URI, &out.URI
diff --git a/pkg/client/camel/go.mod b/pkg/client/camel/go.mod
index be09399..040a55b 100644
--- a/pkg/client/camel/go.mod
+++ b/pkg/client/camel/go.mod
@@ -11,6 +11,7 @@ require (
replace (
k8s.io/apimachinery => k8s.io/apimachinery v0.17.6
k8s.io/client-go => k8s.io/client-go v0.17.6
+ k8s.io/code-generator => k8s.io/code-generator v0.17.6
)
// Local modules