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
commit 4a12ebc1d0830c3d39c35e362e6d6ce048e1dc92 Author: Antonin Stefanutti <anto...@stefanutti.fr> AuthorDate: Mon Oct 3 16:21:56 2022 +0200 fix(api): Quarkus package type validation should not apply to array --- config/crd/bases/camel.apache.org_integrationkits.yaml | 6 +++--- .../crd/bases/camel.apache.org_integrationplatforms.yaml | 12 ++++++------ config/crd/bases/camel.apache.org_integrations.yaml | 6 +++--- config/crd/bases/camel.apache.org_kameletbindings.yaml | 6 +++--- helm/camel-k/crds/crd-integration-kit.yaml | 6 +++--- helm/camel-k/crds/crd-integration-platform.yaml | 12 ++++++------ helm/camel-k/crds/crd-integration.yaml | 6 +++--- helm/camel-k/crds/crd-kamelet-binding.yaml | 6 +++--- pkg/apis/camel/v1/trait/quarkus.go | 2 +- pkg/resources/resources.go | 16 ++++++++-------- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index 8d51628ab..8f642f219 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -185,11 +185,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 90545b2bc..32eba64e0 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1498,11 +1498,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object @@ -3178,11 +3178,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index b08f6f3a6..d6e203f5d 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -7189,11 +7189,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index d24809996..99e7abac0 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7481,11 +7481,11 @@ spec: The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/helm/camel-k/crds/crd-integration-kit.yaml b/helm/camel-k/crds/crd-integration-kit.yaml index 8d51628ab..8f642f219 100644 --- a/helm/camel-k/crds/crd-integration-kit.yaml +++ b/helm/camel-k/crds/crd-integration-kit.yaml @@ -185,11 +185,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 90545b2bc..32eba64e0 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -1498,11 +1498,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object @@ -3178,11 +3178,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index b08f6f3a6..d6e203f5d 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -7189,11 +7189,11 @@ spec: corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index d24809996..99e7abac0 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -7481,11 +7481,11 @@ spec: The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - enum: - - fast-jar - - native items: description: Quarkus package type. + enum: + - fast-jar + - native type: string type: array type: object diff --git a/pkg/apis/camel/v1/trait/quarkus.go b/pkg/apis/camel/v1/trait/quarkus.go index d07b98906..dcbd079d6 100644 --- a/pkg/apis/camel/v1/trait/quarkus.go +++ b/pkg/apis/camel/v1/trait/quarkus.go @@ -36,11 +36,11 @@ type QuarkusTrait struct { // The order influences the resolution of the current kit for the integration. // The kit corresponding to the first package type will be assigned to the // integration in case no existing kit that matches the integration exists. - // +kubebuilder:validation:Enum=fast-jar;native PackageTypes []QuarkusPackageType `property:"package-type" json:"packageTypes,omitempty"` } // Quarkus package type. +// +kubebuilder:validation:Enum=fast-jar;native type QuarkusPackageType string const ( diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 8795ad166..6bc3e4542 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -131,30 +131,30 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationkits.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrationkits.yaml", modTime: time.Time{}, - uncompressedSize: 15176, + uncompressedSize: 15182, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3b\x5d\x6f\xdb\x48\x92\xef\xfa\x15\x85\xf1\x43\x12\x40\xa2\x77\xee\x16\x8b\x83\x0f\xf7\xe0\x75\x92\x59\x23\x89\x9d\x8b\x34\xb3\x37\xc0\x3c\xb8\x44\x96\xa8\x1e\x91\xdd\xdc\xee\xa6\x64\xdd\xe1\xfe\xfb\xa2\xaa\x9b\x14\x25\x91\x92\xc6\x33\xc1\xbe\x84\x2f\x89\xc8\xee\xea\xfa\xfe\x6c\x5f\xc1\xe4\x8f\x7b\x46\x57\xf0\x51\xa5\xa4\x1d\x65\xe0\x0d\xf8\x25\xc1\x6d\x85\xe9\x92\x60\x6a\x16\x7e\x83\x96\xe0\xbd\xa9\x75\x86\x5e\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3b\x5d\x6f\xdb\x48\x92\xef\xfa\x15\x85\xf1\x43\x12\x40\xa2\x77\xee\x16\x8b\x83\x0f\xf7\xe0\x75\x92\x59\x23\x89\x9d\x8b\x34\xb3\x37\xc0\x3c\xb8\x44\x96\xa8\x1e\x91\xdd\xdc\xee\xa6\x64\xdd\xe1\xfe\xfb\xa2\xaa\x9b\x14\x25\x91\x92\xc6\x33\xc1\xbe\x84\x2f\x89\xc8\xee\xea\xfa\xfe\x6c\x5f\xc1\xe4\x8f\x7b\x46\x57\xf0\x51\xa5\xa4\x1d\x65\xe0\x0d\xf8\x25\xc1\x6d\x85\xe9\x92\x60\x6a\x16\x7e\x83\x96\xe0\xbd\xa9\x75\x86\x5e\x [...] }, "/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 181351, + uncompressedSize: 181363, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x30\xfe\x7f\x3e\x05\xc6\x9d\x3b\x76\x32\x92\x9c\xec\xde\xee\xf6\xfa\x4e\xe7\x79\x5c\x27\x6d\xdd\xc4\xb1\xaf\xed\x64\xef\x4e\xdb\xa9\x20\xf2\x48\x42\x4c\x02\x5c\x00\x94\xad\xfe\xf6\xf7\xdd\x9f\xc1\x01\x40\x52\x12\x09\x52\x92\x5f\xd2\x46\xec\xcc\x6e\x6c\x13\xe0\xc1\xc1\xc1\x79\xc3\x79\xf9\x8a\xf4\xef\xef\x79\xf6\x15\x79\xc7\x22\xe0\x0a\x62\xa2\x05\xd1\x53\x20\xc7\x19\x8d\xa6\x40\xae\xc4\x58\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x30\xfe\x7f\x3e\x05\xc6\x9d\x3b\x76\x32\x92\x9c\xec\xde\xee\xf6\xfa\x4e\xe7\x79\x5c\x27\x6d\xdd\xc4\xb1\xaf\xed\x64\xef\x4e\xdb\xa9\x20\xf2\x48\x42\x4c\x02\x5c\x00\x94\xad\xfe\xf6\xf7\xdd\x9f\xc1\x01\x40\x52\x12\x09\x52\x92\x5f\xd2\x46\xec\xcc\x6e\x6c\x13\xe0\xc1\xc1\xc1\x79\xc3\x79\xf9\x8a\xf4\xef\xef\x79\xf6\x15\x79\xc7\x22\xe0\x0a\x62\xa2\x05\xd1\x53\x20\xc7\x19\x8d\xa6\x40\xae\xc4\x58\x [...] }, "/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrations.yaml", modTime: time.Time{}, - uncompressedSize: 489041, + uncompressedSize: 489047, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x38\x0c\xff\xef\x4f\x81\x72\x52\x3f\x49\x1b\x91\xb2\x33\xb3\x53\x3b\x7e\xa7\x36\xa5\x91\xe4\x44\x6f\x6c\x99\x65\x29\xc9\x2f\xe5\x64\x13\xb0\x1b\x24\xb1\x6a\x02\x3d\x00\x9a\x12\xe7\xc9\xf3\xdd\x9f\xc2\x01\xd0\x17\xde\xfa\xa0\x45\x3a\xce\x4c\x63\xaa\x32\x26\xc5\x3e\x8d\xcb\xc1\xb9\x5f\x3e\x23\x83\xfd\x8d\x67\x9f\x91\x37\x3c\x61\x42\xb3\x94\x18\x49\xcc\x8c\x91\xf3\x9c\x26\x33\x46\x6e\xe5\xc4\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x38\x0c\xff\xef\x4f\x81\x72\x52\x3f\x49\x1b\x91\xb2\x33\xb3\x53\x3b\x7e\xa7\x36\xa5\x91\xe4\x44\x6f\x6c\x99\x65\x29\xc9\x2f\xe5\x64\x13\xb0\x1b\x24\xb1\x6a\x02\x3d\x00\x9a\x12\xe7\xc9\xf3\xdd\x9f\xc2\x01\xd0\x17\xde\xfa\xa0\x45\x3a\xce\x4c\x63\xaa\x32\x26\xc5\x3e\x8d\xcb\xc1\xb9\x5f\x3e\x23\x83\xfd\x8d\x67\x9f\x91\x37\x3c\x61\x42\xb3\x94\x18\x49\xcc\x8c\x91\xf3\x9c\x26\x33\x46\x6e\xe5\xc4\x [...] }, "/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_kameletbindings.yaml", modTime: time.Time{}, - uncompressedSize: 563099, + uncompressedSize: 563105, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\xb6\x28\x8a\xff\x9f\x4f\x81\x72\x52\x47\xd2\x8e\x48\xd9\x99\x47\xed\xf1\x6f\xea\xa4\xb4\x65\x39\xd1\x2f\xb1\xcc\xb2\x94\xe4\xa4\x9c\xec\x04\xec\x06\x49\x1c\x35\x81\xde\x00\x9a\x12\xe7\xe6\x7e\xf7\x5b\x58\x00\xba\xd1\x7c\x09\xab\x29\x69\xe4\x99\xc6\x54\x65\x4c\x8a\xbd\x1a\x8f\x85\xf5\x7e\x7c\x4e\x06\x0f\x37\x3e\xfb\x9c\x7c\xcf\x33\x26\x34\xcb\x89\x91\xc4\xcc\x18\x39\x2d\x69\x36\x63\xe4\x4a\x4e\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\xb6\x28\x8a\xff\x9f\x4f\x81\x72\x52\x47\xd2\x8e\x48\xd9\x99\x47\xed\xf1\x6f\xea\xa4\xb4\x65\x39\xd1\x2f\xb1\xcc\xb2\x94\xe4\xa4\x9c\xec\x04\xec\x06\x49\x1c\x35\x81\xde\x00\x9a\x12\xe7\xe6\x7e\xf7\x5b\x58\x00\xba\xd1\x7c\x09\xab\x29\x69\xe4\x99\xc6\x54\x65\x4c\x8a\xbd\x1a\x8f\x85\xf5\x7e\x7c\x4e\x06\x0f\x37\x3e\xfb\x9c\x7c\xcf\x33\x26\x34\xcb\x89\x91\xc4\xcc\x18\x39\x2d\x69\x36\x63\xe4\x4a\x4e\x [...] }, "/crd/bases/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_kamelets.yaml",