This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 76ad382af5c385f6a4f45cb7d5b14252143531a2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Mar 14 23:48:21 2023 +0000 chore: nightly resource refresh --- .../bases/camel.apache.org_integrationplatforms.yaml | 14 ++++++++++++++ config/crd/bases/camel.apache.org_integrations.yaml | 7 +++++++ .../crd/bases/camel.apache.org_kameletbindings.yaml | 8 ++++++++ docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 9 +++++++++ docs/modules/traits/pages/knative.adoc | 6 ++++++ helm/camel-k/crds/crd-integration-platform.yaml | 14 ++++++++++++++ helm/camel-k/crds/crd-integration.yaml | 7 +++++++ helm/camel-k/crds/crd-kamelet-binding.yaml | 8 ++++++++ pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 5 +++++ pkg/resources/resources.go | 20 ++++++++++---------- resources/traits.yaml | 6 ++++++ 11 files changed, 94 insertions(+), 10 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 5f890c12a..51672f39f 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1065,6 +1065,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the @@ -2652,6 +2659,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index 4072fb5ab..1c4bf2eba 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -6842,6 +6842,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index 2aaa4a557..bbec3c111 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7129,6 +7129,14 @@ spec: removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the + "bindings.knative.dev/include=true" label to the namespace + As Knative requires this label to perform injection + of K_SINK URL into the service. If this is false, the + integration pod may start and fail, read the SinkBinding + Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 5cd8defff..c776168ee 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -5151,6 +5151,15 @@ bool Enable automatic discovery of all trait properties. +|`namespaceLabel` + +bool +| + + +Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace +As Knative requires this label to perform injection of K_SINK URL into the service. +If this is false, the integration pod may start and fail, read the SinkBinding Knative documentation. (default: true) + |=== diff --git a/docs/modules/traits/pages/knative.adoc b/docs/modules/traits/pages/knative.adoc index 6de698a76..ef2af7007 100755 --- a/docs/modules/traits/pages/knative.adoc +++ b/docs/modules/traits/pages/knative.adoc @@ -80,6 +80,12 @@ It's enabled by default when the integration targets a single sink | bool | Enable automatic discovery of all trait properties. +| knative.namespace-label +| bool +| Enables the camel-k-operator to set the "bindings.knative.dev/include=true" label to the namespace +As Knative requires this label to perform injection of K_SINK URL into the service. +If this is false, the integration pod may start and fail, read the SinkBinding Knative documentation. (default: true) + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 5f890c12a..51672f39f 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -1065,6 +1065,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the @@ -2652,6 +2659,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 4072fb5ab..1c4bf2eba 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -6842,6 +6842,13 @@ spec: "ce-knativehistory". Since this header has been removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to + perform injection of K_SINK URL into the service. If this + is false, the integration pod may start and fail, read the + SinkBinding Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used when the diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index 2aaa4a557..bbec3c111 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -7129,6 +7129,14 @@ spec: removed in newer versions of Knative, filtering is disabled by default. type: boolean + namespaceLabel: + description: 'Enables the camel-k-operator to set the + "bindings.knative.dev/include=true" label to the namespace + As Knative requires this label to perform injection + of K_SINK URL into the service. If this is false, the + integration pod may start and fail, read the SinkBinding + Knative documentation. (default: true)' + type: boolean sinkBinding: description: Allows binding the integration to a sink via a Knative SinkBinding resource. This can be used diff --git a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go index 144e4aa41..942ac425d 100644 --- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go @@ -608,6 +608,11 @@ func (in *KnativeTrait) DeepCopyInto(out *KnativeTrait) { *out = new(bool) **out = **in } + if in.NamespaceLabel != nil { + in, out := &in.NamespaceLabel, &out.NamespaceLabel + *out = new(bool) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new KnativeTrait. diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 7ff594826..e2228db39 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -138,30 +138,30 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 170855, + uncompressedSize: 171895, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\xe3\x36\xb2\x28\xfe\xff\x7c\x0a\x94\x53\xa7\xc6\x33\x65\xc9\x33\xbb\x27\xbb\x39\x3e\x95\xba\xd7\xf1\x4c\x12\x67\x1e\xf6\xb1\x3d\xb3\xbb\x95\xa4\x22\x88\x6c\x49\x88\x41\x80\x07\x00\x65\x2b\xbf\xfd\x7d\xf7\x5b\x68\x00\x24\x25\x91\x20\x25\x79\x1e\x49\xc4\x54\xed\x8e\x6d\xa2\xd9\x00\x1a\xfd\x42\x3f\xbe\x20\x83\x87\x7b\x1e\x7d\x41\x5e\xb3\x04\x84\x86\x94\x18\x49\xcc\x0c\xc8\x69\x4e\x93\x19\x90\x6b\x39\x31\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\x71\x32\x7a\x49\x76\x6f\x77\x7b\x7d\xa7\xf3\x3c\xae\xed\xb6\x6e\xe2\xd8\xd7\x76\xb2\xbb\xd3\x76\x2a\x88\x3c\x92\x50\x93\x00\x2f\x00\xca\x56\x7f\xfb\xfb\xee\xcf\xe0\x00\x20\x29\x89\x04\x29\xc9\x71\xd2\x56\xec\xcc\x6e\x6c\x13\x87\x07\xc0\xc1\x79\xc3\x79\xf9\x82\xf4\x1f\xef\x79\xf6\x05\x79\xcb\x22\xe0\x0a\x62\xa2\x05\xd1\x33\x20\xc7\x19\x8d\x66\x40\x6e\xc4\x44\x [...] }, "/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_integrations.yaml", modTime: time.Time{}, - uncompressedSize: 492312, + uncompressedSize: 492832, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x30\x8c\xff\x9f\x4f\x81\x72\x52\x8f\xa4\x8d\x48\xd9\x99\xd9\xa9\x19\xff\xa6\x9e\x94\x56\x96\x13\xfd\x62\xcb\x2a\x4b\x49\x9e\x94\x93\x4d\xc0\x6e\x90\xc4\xa3\x6e\xa0\x17\x40\x53\xe2\xbc\x79\xbf\xfb\x5b\x38\x00\xfa\xc2\x5b\x1f\xb4\x48\xc7\xd9\x6d\x4c\x55\xc6\x14\xd9\xa7\x71\x39\x38\xf7\xcb\xe7\x64\xb4\xbf\xf1\xd9\xe7\xe4\x0d\x4f\x98\xd0\x2c\x25\x46\x12\x33\x67\xe4\xbc\xa0\xc9\x9c\x91\x5b\x39\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x7b\x73\x1b\x37\x96\x30\x8c\xff\x9f\x4f\x81\x72\x52\x8f\xa4\x8d\x48\xd9\x99\xd9\xa9\x19\xff\xa6\x9e\x94\x56\x96\x13\xfd\x62\xcb\x2a\x4b\x49\x9e\x94\x93\x4d\xc0\x6e\x90\xc4\xa3\x6e\xa0\x17\x40\x53\xe2\xbc\x79\xbf\xfb\x5b\x38\x00\xfa\xc2\x5b\x1f\xb4\x48\xc7\xd9\x6d\x4c\x55\xc6\x14\xd9\xa7\x71\x39\x38\xf7\xcb\xe7\x64\xb4\xbf\xf1\xd9\xe7\xe4\x0d\x4f\x98\xd0\x2c\x25\x46\x12\x33\x67\xe4\xbc\xa0\xc9\x9c\x91\x5b\x39\x [...] }, "/crd/bases/camel.apache.org_kameletbindings.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_kameletbindings.yaml", modTime: time.Time{}, - uncompressedSize: 571953, + uncompressedSize: 572531, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\x79\x73\x1b\x37\xd6\x28\x8c\xff\xef\x4f\x81\x92\x53\x57\xd2\x13\x91\xb2\x33\x4b\xcd\xf8\x37\x75\x53\x1a\x59\x76\xf4\x8b\x2d\xb3\x2c\x25\xb9\x29\x27\x4f\x02\x76\x83\x24\xae\xba\x81\x7e\x00\x34\x25\xe6\xf5\xfb\xdd\xdf\xc2\x01\xd0\x0b\x37\xe1\x34\x25\x8d\x3c\xd3\x98\xaa\x8c\x49\xb1\x4f\x63\x3b\xfb\xf6\x9c\x0c\xee\x6f\x3c\x7b\x4e\xde\xf1\x84\x09\xcd\x52\x62\x24\x31\x33\x46\x4e\x0a\x9a\xcc\x18\xb9\x94\x13\x73\x43\x [...] }, "/crd/bases/camel.apache.org_kamelets.yaml": &vfsgen۰CompressedFileInfo{ name: "camel.apache.org_kamelets.yaml", modTime: time.Time{}, - uncompressedSize: 39522, + uncompressedSize: 39622, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5d\x7b\x6f\xdb\x3a\xb2\xff\xdf\x9f\x62\x90\x2c\xd0\x14\x88\x9d\x38\x49\xbb\x3d\xb9\x7f\x14\xd9\xa4\x3d\xc7\xf7\xf4\x11\x24\xe9\xee\x3d\xb7\xe9\x02\xb4\x34\xb6\xb9\x91\x28\x2d\x49\xe5\x71\x4f\xfb\xdd\x2f\x48\x4a\xb6\x14\x5b\xd2\xd0\x91\x4f\xbb\x8b\x25\x50\x34\xb6\xa8\xe1\x70\x66\x38\xc3\xc7\x8f\xe3\x6d\xe8\x77\x57\x7a\xdb\xf0\x8e\x07\x28\x14\x86\xa0\x13\xd0\x33\x84\x93\x94\x05\x33\x84\xcb\x64\xa2\xef\x98\x44\x78\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x5d\x7b\x6f\xdb\x3a\xb2\xff\xdf\x9f\x62\x90\x2c\xd0\x14\x88\x9d\x38\x49\xbb\x3d\xb9\x7f\x14\xd9\xa4\x3d\xc7\xf7\xf4\x11\x24\xe9\xee\x3d\xb7\xe9\x02\xb4\x34\xb6\xb9\x91\x28\x2d\x49\xe5\x71\x4f\xfb\xdd\x2f\x48\x4a\xb6\x14\x5b\xd2\xd0\x91\x4f\xbb\x8b\x25\x50\x34\xb6\xa8\xe1\x70\x66\x38\xc3\xc7\x8f\xe3\x6d\xe8\x77\x57\x7a\xdb\xf0\x8e\x07\x28\x14\x86\xa0\x13\xd0\x33\x84\x93\x94\x05\x33\x84\xcb\x64\xa2\xef\x98\x44\x78\x [...] }, "/manager": &vfsgen۰DirInfo{ name: "manager", @@ -625,9 +625,9 @@ var assets = func() http.FileSystem { "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 64511, + uncompressedSize: 64890, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\x37\x92\xe0\xef\xfe\x2b\xf0\xb8\xb7\x4f\x92\x8f\x1f\x4a\x66\x33\x9b\xd5\x9d\x77\x4e\x71\x9c\x8c\x12\x7f\xe8\x2c\x25\xb3\xf3\x7c\x7e\x43\xb0\x1b\x24\x61\x36\x81\x1e\x00\x2d\x89\xb9\xb9\xff\xfd\x1e\xaa\x0a\x1f\xdd\x6c\x4a\x94\x6d\x65\x47\x3b\x99\x79\x2f\x16\xc9\xee\x42\xa1\x50\x28\x14\xea\xd3\x19\x2e\x9d\x3d\x79\x32\x62\x8a\xaf\xc5\x09\xfb\x9d\x2d\x78\x25\x9e\x30\x56\x57\xdc\xcd\xb5\x59\x9f\xb0\x39\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\x37\x92\xe0\xef\xfe\x2b\xf0\xb8\xb7\x4f\x92\x8f\xa4\xe4\xcc\x66\x36\xab\x3b\xef\x9c\xe2\x38\x19\xc5\x5f\x3a\x4b\xc9\xec\x3c\x9f\xdf\x10\xec\x06\x49\x98\x4d\xa0\x07\x40\x4b\x66\x6e\xee\x7f\xbf\x87\xaa\xc2\x47\x37\x9b\x22\x65\x5b\xd9\xd1\x4e\x66\xde\x8b\x45\xb2\xbb\x50\x28\x14\x0a\x85\xfa\x74\x86\x4b\x67\x4f\x1f\x8d\x98\xe2\x2b\x71\xca\x7e\x67\x0b\x5e\x89\x47\x8c\xd5\x15\x77\x33\x6d\x56\xa7\x6c\xc6\x [...] }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ diff --git a/resources/traits.yaml b/resources/traits.yaml index 71faf03a9..8178760ac 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -905,6 +905,12 @@ traits: - name: auto type: bool description: Enable automatic discovery of all trait properties. + - name: namespace-label + type: bool + description: 'Enables the camel-k-operator to set the "bindings.knative.dev/include=true" + label to the namespace As Knative requires this label to perform injection of + K_SINK URL into the service. If this is false, the integration pod may start + and fail, read the SinkBinding Knative documentation. (default: true)' - name: knative-service platform: false profiles: