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 2021/01/22 13:39:31 UTC
[camel-k] branch master updated: fix(api): Add missing
x-descriptors field to Kamelet property type
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 0d741a7 fix(api): Add missing x-descriptors field to Kamelet property type
0d741a7 is described below
commit 0d741a70e40256a5c99a2de36520e6a3f6cb656c
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Fri Jan 22 09:39:26 2021 +0100
fix(api): Add missing x-descriptors field to Kamelet property type
---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 12 ++++++++++++
config/crd/bases/camel.apache.org_kamelets.yaml | 12 ++++++++++++
deploy/crd-kamelet-binding.yaml | 12 ++++++++++++
deploy/crd-kamelet.yaml | 12 ++++++++++++
.../1.4.0-snapshot/kameletbindings.camel.apache.org.crd.yaml | 12 ++++++++++++
.../1.4.0-snapshot/kamelets.camel.apache.org.crd.yaml | 12 ++++++++++++
deploy/resources.go | 8 ++++----
helm/camel-k/crds/crd-kamelet-binding.yaml | 12 ++++++++++++
helm/camel-k/crds/crd-kamelet.yaml | 12 ++++++++++++
pkg/apis/camel/v1alpha1/jsonschema_types.go | 4 +++-
pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go | 5 +++++
11 files changed, 108 insertions(+), 5 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index f4a5ba8..70b5acb 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -367,6 +367,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -575,6 +581,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/config/crd/bases/camel.apache.org_kamelets.yaml b/config/crd/bases/camel.apache.org_kamelets.yaml
index ec9c3d1..377c2b1 100644
--- a/config/crd/bases/camel.apache.org_kamelets.yaml
+++ b/config/crd/bases/camel.apache.org_kamelets.yaml
@@ -192,6 +192,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine which
+ UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -387,6 +393,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/deploy/crd-kamelet-binding.yaml b/deploy/crd-kamelet-binding.yaml
index f4a5ba8..70b5acb 100644
--- a/deploy/crd-kamelet-binding.yaml
+++ b/deploy/crd-kamelet-binding.yaml
@@ -367,6 +367,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -575,6 +581,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/deploy/crd-kamelet.yaml b/deploy/crd-kamelet.yaml
index ec9c3d1..377c2b1 100644
--- a/deploy/crd-kamelet.yaml
+++ b/deploy/crd-kamelet.yaml
@@ -192,6 +192,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine which
+ UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -387,6 +393,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kameletbindings.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kameletbindings.camel.apache.org.crd.yaml
index f4a5ba8..70b5acb 100644
--- a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kameletbindings.camel.apache.org.crd.yaml
+++ b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kameletbindings.camel.apache.org.crd.yaml
@@ -367,6 +367,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -575,6 +581,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kamelets.camel.apache.org.crd.yaml b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kamelets.camel.apache.org.crd.yaml
index ec9c3d1..377c2b1 100644
--- a/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kamelets.camel.apache.org.crd.yaml
+++ b/deploy/olm-catalog/camel-k-dev/1.4.0-snapshot/kamelets.camel.apache.org.crd.yaml
@@ -192,6 +192,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine which
+ UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -387,6 +393,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/deploy/resources.go b/deploy/resources.go
index 73386b8..e6c33d5 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -147,16 +147,16 @@ var assets = func() http.FileSystem {
"/crd-kamelet-binding.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-kamelet-binding.yaml",
modTime: time.Time{},
- uncompressedSize: 35241,
+ uncompressedSize: 35967,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x7d\x4f\xe3\xb8\xd6\xf8\xff\xfd\x14\x47\xb0\xd2\x80\x44\xfa\x42\x61\x76\xa6\xbf\x3f\x46\x2c\x0c\xfb\xeb\xdd\x59\x40\x14\xee\xd5\x3e\x30\x57\x72\x93\xd3\xd6\x8b\x63\xe7\xda\x0e\xa5\xcf\xc2\x77\x7f\x64\x3b\x69\xd3\x97\xa4\xe9\x14\xe6\xce\x4a\xb1\x34\x9a\x26\x71\x8e\xcf\xbb\x8f\x8f\x7d\xc8\x2e\x78\xaf\xd7\x6a\xbb\xf0\x85\xfa\xc8\x15\x06\xa0\x05\xe8\x11\xc2\x49\x44\xfc\x11\x42\x4f\x0c\xf4\x98\x48\x84\x73\x11\xf3\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x6f\xdb\xb8\xd2\xf0\x77\xff\x8a\x41\xb2\x40\x53\x20\xf2\x25\x4e\xba\xad\xdf\x0f\x45\x36\x69\xf6\xf5\xd9\x6e\x12\xc4\xc9\x39\xd8\x27\xed\x01\x68\x69\x6c\x73\x43\x91\x3a\x24\x65\xc7\xcf\x36\xff\xfd\x01\x49\xc9\x96\x2f\x92\xe5\x38\xe9\xe9\x02\x22\x50\xd4\x92\xa8\xe1\xdc\x39\x1c\x72\xa2\x7d\xf0\x5e\xae\xd5\xf6\xe1\x33\xf5\x91\x2b\x0c\x40\x0b\xd0\x23\x84\xd3\x88\xf8\x23\x84\x9e\x18\xe8\x09\x91\x08\x17\x22\xe6\x [...]
},
"/crd-kamelet.yaml": &vfsgen۰CompressedFileInfo{
name: "crd-kamelet.yaml",
modTime: time.Time{},
- uncompressedSize: 23207,
+ uncompressedSize: 23849,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\xe9\x30\x12\x29\x2d\x85\x39\x33\xbd\x7f\x8c\x38\x30\xec\xed\x3d\x1c\x40\x14\x76\x75\x2e\xcc\x4a\x6e\xf2\xb4\xf5\x92\xd8\x59\xdb\xe1\x65\x0f\x7c\xf7\x2b\xdb\x49\x9a\xbe\x24\x71\x4a\x99\x1d\x5d\xad\xa5\xd1\xb4\xa9\xfd\xf3\xf3\xe6\xc7\x6f\x3f\xb2\x0d\xde\xe6\x4a\x6b\x1b\xce\xa8\x8f\x4c\x62\x00\x8a\x83\x9a\x22\x1c\xc5\xc4\x9f\x22\x0c\xf9\x58\x3d\x12\x81\x70\xca\x13\x16\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5c\x7d\x4f\xe3\x3a\xba\xff\xbf\x9f\xe2\x11\x1c\xe9\x30\x12\x29\x2d\x85\x39\x33\xbd\x7f\x20\x0e\x0c\x7b\x7b\x0f\x07\x10\x85\x5d\x9d\x0b\xb3\x92\x9b\x3c\x6d\xbd\x24\x76\xd6\x76\x28\xec\x81\xef\x7e\x65\x3b\x69\xd3\x97\x24\x4e\x29\xec\xe8\x6a\x2d\x8d\xa6\x4d\xed\x9f\x9f\x37\x3f\x7e\xfb\x91\x6d\xf0\x36\x57\x1a\xdb\x70\x4e\x7d\x64\x12\x03\x50\x1c\xd4\x18\xe1\x38\x26\xfe\x18\xa1\xcf\x87\x6a\x42\x04\xc2\x19\x4f\x58\x40\x [...]
},
"/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{
name: "operator-deployment.yaml",
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml
index f4a5ba8..70b5acb 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -367,6 +367,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -575,6 +581,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/helm/camel-k/crds/crd-kamelet.yaml b/helm/camel-k/crds/crd-kamelet.yaml
index ec9c3d1..377c2b1 100644
--- a/helm/camel-k/crds/crd-kamelet.yaml
+++ b/helm/camel-k/crds/crd-kamelet.yaml
@@ -192,6 +192,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine which
+ UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
@@ -387,6 +393,12 @@ spec:
type: string
uniqueItems:
type: boolean
+ x-descriptors:
+ description: The list of descriptors that determine
+ which UI components to use on different views
+ items:
+ type: string
+ type: array
type: object
type: object
required:
diff --git a/pkg/apis/camel/v1alpha1/jsonschema_types.go b/pkg/apis/camel/v1alpha1/jsonschema_types.go
index e17a781..db3b10a 100644
--- a/pkg/apis/camel/v1alpha1/jsonschema_types.go
+++ b/pkg/apis/camel/v1alpha1/jsonschema_types.go
@@ -74,6 +74,8 @@ type JSONSchemaProp struct {
Enum []JSON `json:"enum,omitempty"`
Example *JSON `json:"example,omitempty"`
Nullable bool `json:"nullable,omitempty"`
+ // The list of descriptors that determine which UI components to use on different views
+ XDescriptors []string `json:"x-descriptors,omitempty"`
}
// JSONSchemaProps is a JSON-Schema following Specification Draft 4 (http://json-schema.org/).
@@ -131,4 +133,4 @@ type JSONSchemaURL string
type ExternalDocumentation struct {
Description string `json:"description,omitempty""`
URL string `json:"url,omitempty"`
-}
+}
\ No newline at end of file
diff --git a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
index 5fc5873..00a682c 100644
--- a/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go
@@ -203,6 +203,11 @@ func (in *JSONSchemaProp) DeepCopyInto(out *JSONSchemaProp) {
*out = new(JSON)
(*in).DeepCopyInto(*out)
}
+ if in.XDescriptors != nil {
+ in, out := &in.XDescriptors, &out.XDescriptors
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new JSONSchemaProp.