You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2022/01/27 17:13:02 UTC
[camel-k] branch main updated: fix(api): Add missing loader metadata field in CamelCatalog API
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new c26c464 fix(api): Add missing loader metadata field in CamelCatalog API
c26c464 is described below
commit c26c4641da76f6a200d8c554eb569c4ae18a5287
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Thu Jan 27 13:00:46 2022 +0100
fix(api): Add missing loader metadata field in CamelCatalog API
---
config/crd/bases/camel.apache.org_camelcatalogs.yaml | 4 ++++
helm/camel-k/crds/crd-camel-catalog.yaml | 4 ++++
pkg/apis/camel/v1/camelcatalog_types.go | 5 +++--
pkg/resources/resources.go | 4 ++--
4 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_camelcatalogs.yaml b/config/crd/bases/camel.apache.org_camelcatalogs.yaml
index 536db40..4dfe8c8 100644
--- a/config/crd/bases/camel.apache.org_camelcatalogs.yaml
+++ b/config/crd/bases/camel.apache.org_camelcatalogs.yaml
@@ -246,6 +246,10 @@ spec:
items:
type: string
type: array
+ metadata:
+ additionalProperties:
+ type: string
+ type: object
version:
type: string
required:
diff --git a/helm/camel-k/crds/crd-camel-catalog.yaml b/helm/camel-k/crds/crd-camel-catalog.yaml
index 536db40..4dfe8c8 100644
--- a/helm/camel-k/crds/crd-camel-catalog.yaml
+++ b/helm/camel-k/crds/crd-camel-catalog.yaml
@@ -246,6 +246,10 @@ spec:
items:
type: string
type: array
+ metadata:
+ additionalProperties:
+ type: string
+ type: object
version:
type: string
required:
diff --git a/pkg/apis/camel/v1/camelcatalog_types.go b/pkg/apis/camel/v1/camelcatalog_types.go
index 04f1e19..21cd651 100644
--- a/pkg/apis/camel/v1/camelcatalog_types.go
+++ b/pkg/apis/camel/v1/camelcatalog_types.go
@@ -60,8 +60,9 @@ type CamelArtifact struct {
// CamelLoader --
type CamelLoader struct {
MavenArtifact `json:",inline" yaml:",inline"`
- Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"`
- Dependencies []MavenArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"`
+ Languages []string `json:"languages,omitempty" yaml:"languages,omitempty"`
+ Dependencies []MavenArtifact `json:"dependencies,omitempty" yaml:"dependencies,omitempty"`
+ Metadata map[string]string `json:"metadata,omitempty" yaml:"metadata,omitempty"`
}
// CamelCatalogSpec defines the desired state of CamelCatalog
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 931a4a7..05d066a 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -124,9 +124,9 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_camelcatalogs.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_camelcatalogs.yaml",
modTime: time.Time{},
- uncompressedSize: 13197,
+ uncompressedSize: 13343,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x5f\x8f\xdb\xb8\x11\x7f\xd7\xa7\x18\xc4\x0f\xb9\x03\xd6\xf2\xa5\xed\x43\xe1\x3e\xb9\xce\x06\x35\x92\xf3\x2e\xd6\xbe\x1c\xee\x91\x96\xc6\x32\xb3\x14\xa9\x92\x94\x1d\xb7\xe8\x77\x2f\x48\x4a\x96\x64\x5b\x12\x95\xf8\x90\xf6\xb2\xf3\x64\x8b\xc3\xe1\xf0\x37\x7f\x45\x71\x04\xe3\xdb\x51\x30\x82\x0f\x34\x42\xae\x30\x06\x2d\x40\xef\x10\x66\x19\x89\x76\x08\x2b\xb1\xd5\x07\x22\x11\xde\x89\x9c\xc7\x44\x53\xc1\xe1\x87\xd9\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5a\x4f\x8f\xdb\xb8\x15\xbf\xeb\x53\x3c\xc4\x87\xec\x02\x63\x79\xd3\xf6\x50\xb8\x27\x77\x32\x41\x8d\x64\x3d\x83\xb1\x37\x8b\x3d\xd2\xd2\xb3\xcc\x0c\x45\xaa\x24\x65\xc7\x2d\xfa\xdd\x0b\x92\x92\x25\xd9\x96\x44\x4d\xbc\x98\x76\x33\xef\x64\x8b\xe4\xe3\x8f\xbf\xf7\x57\x7f\x46\x30\xbe\x9e\x04\x23\xf8\x44\x23\xe4\x0a\x63\xd0\x02\xf4\x16\x61\x96\x91\x68\x8b\xb0\x14\x1b\xbd\x27\x12\xe1\x83\xc8\x79\x4c\x34\x15\x1c\x7e\x98\x [...]
},
"/crd/bases/camel.apache.org_integrationkits.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrationkits.yaml",