You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2023/03/15 23:48:19 UTC
[camel-k] branch release-1.10.x updated (67f98a92e -> 4e8591b12)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from 67f98a92e fix(knative): Integration in error state when knative SinkBinding mode=inclusion #4119 (#4133)
new 2372da61b chore: changelog automatic update
new 4e8591b12 chore: nightly resource refresh
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 1 +
.../crd/bases/camel.apache.org_integrationplatforms.yaml | 14 ++++++++++++++
config/crd/bases/camel.apache.org_integrations.yaml | 7 +++++++
config/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 | 16 ++++++++--------
resources/traits.yaml | 6 ++++++
12 files changed, 93 insertions(+), 8 deletions(-)
[camel-k] 02/02: chore: nightly resource refresh
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 4e8591b126544b4d612caaeb73deefb2bf07d6ee
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Mar 15 23:48:13 2023 +0000
chore: nightly resource refresh
---
.../crd/bases/camel.apache.org_integrationplatforms.yaml | 14 ++++++++++++++
config/crd/bases/camel.apache.org_integrations.yaml | 7 +++++++
config/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 | 16 ++++++++--------
resources/traits.yaml | 6 ++++++
11 files changed, 92 insertions(+), 8 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
index f01c288f1..96f0aec8f 100644
--- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml
+++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml
@@ -1142,6 +1142,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
@@ -2776,6 +2783,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 3a4f9bac0..a3a74a584 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -6833,6 +6833,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 37fe2cb1c..4621aabba 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -7121,6 +7121,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 5f4b857d2..39a6f08fa 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -5018,6 +5018,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 f01c288f1..96f0aec8f 100644
--- a/helm/camel-k/crds/crd-integration-platform.yaml
+++ b/helm/camel-k/crds/crd-integration-platform.yaml
@@ -1142,6 +1142,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
@@ -2776,6 +2783,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 3a4f9bac0..a3a74a584 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -6833,6 +6833,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 37fe2cb1c..4621aabba 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -7121,6 +7121,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 cab7a094d..3c7f5ed3b 100644
--- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go
@@ -599,6 +599,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 6e51234f3..f3531725a 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -138,23 +138,23 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_integrationplatforms.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrationplatforms.yaml",
modTime: time.Time{},
- uncompressedSize: 177901,
+ uncompressedSize: 178941,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\xdb\x36\xb6\x30\x8e\xff\x9e\xbf\x02\xe3\xce\x9d\x38\x19\x49\x4e\xba\xb7\xbb\xbd\x7e\xa6\xf3\x3c\xae\x93\xb6\x6e\xe2\xd8\xd7\x76\x72\xef\x4e\xdb\xa9\x20\xf2\x48\x42\x4c\x02\x5c\x00\x94\xad\x7e\xf7\xfb\xbf\x7f\x06\x07\x00\x49\x49\x24\x48\x49\x7e\x6b\x23\x76\x66\x37\xb6\x09\xf0\xe0\xe0\xe0\xbc\xe1\xbc\x7c\x45\xfa\x77\xf7\x3c\xfb\x8a\xbc\x67\x11\x70\x05\x31\xd1\x82\xe8\x29\x90\xa3\x8c\x46\x53\x20\x97\x62\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xfd\xfd\x73\xdb\x36\xb6\x30\x8e\xff\x9e\xbf\x02\xe3\xce\x9d\x38\x19\x49\x4e\xba\xb7\xbb\xbd\x7e\xa6\xf3\x3c\xae\x93\xb6\x6e\xe2\xd8\xd7\x76\x72\xef\x4e\xdb\xa9\x20\xf2\x48\x42\x4c\x02\x5c\x00\x94\xad\x7e\xf7\xfb\xbf\x7f\x06\x07\x00\x49\x49\x24\x48\x49\x7e\x6b\x23\x76\x66\x37\xb6\x09\xf0\xe0\xe0\xe0\xbc\xe1\xbc\x7c\x45\xfa\x77\xf7\x3c\xfb\x8a\xbc\x67\x11\x70\x05\x31\xd1\x82\xe8\x29\x90\xa3\x8c\x46\x53\x20\x97\x62\x [...]
},
"/crd/bases/camel.apache.org_integrations.yaml": &vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrations.yaml",
modTime: time.Time{},
- uncompressedSize: 487316,
+ uncompressedSize: 487836,
- 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: 561190,
+ uncompressedSize: 561768,
- 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",
@@ -604,9 +604,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 57159,
+ uncompressedSize: 57538,
- compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1c\x37\x92\x20\xfe\xbf\x3f\x05\x82\xfb\xdb\x20\xa9\xe8\x6e\xca\x9e\xf5\xac\x7f\xbc\xd3\xce\xd1\x92\xec\xa1\xad\x07\x4f\xa4\x3d\x3b\xa1\x53\x4c\xa3\xab\xd0\xdd\x50\x57\x03\x35\x00\x8a\x54\xfb\xf6\xbe\xfb\x05\x32\x13\x8f\xaa\xae\x66\x17\x25\xd2\x37\xbc\xbd\x9d\x88\xb5\x48\x16\x12\x89\x44\x22\x91\x6f\x38\xc3\xa5\xb3\xa7\x5f\x8d\x99\xe2\x6b\x71\xca\xfe\x60\x0b\x5e\x89\xaf\x18\xab\x2b\xee\xe6\xda\xac\x4f\x [...]
+ compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xff\x73\x1c\xb7\xb1\x20\xfe\xbb\xff\x0a\x14\xf3\x79\x45\x52\xb5\xbb\x94\x9d\xe7\xc4\x1f\xde\xe9\xe5\x18\x49\x76\x68\x7d\xe3\x89\xb4\xf3\x52\x3a\x95\x17\x3b\x83\xdd\x85\x76\x16\x98\x00\x18\x52\xeb\xcb\xfd\xef\x57\xe8\x6e\x7c\x99\xd9\x59\xee\x50\x12\x7d\xe1\xe5\x5e\xaa\x9e\x45\x72\x00\x34\x1a\x8d\x46\x7f\x6f\x67\xb8\x74\xf6\xf4\xab\x31\x53\x7c\x2d\x4e\xd9\xef\x6d\xc1\x2b\xf1\x15\x63\x75\xc5\xdd\x5c\x9b\xf5\x29\x [...]
},
}
fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{
diff --git a/resources/traits.yaml b/resources/traits.yaml
index 1467392a3..6418d6f3d 100755
--- a/resources/traits.yaml
+++ b/resources/traits.yaml
@@ -831,6 +831,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:
[camel-k] 01/02: chore: changelog automatic update
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.10.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 2372da61b2d38e2b1182b182a10de62e673f2391
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Mar 15 23:42:26 2023 +0000
chore: changelog automatic update
---
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47f47761e..e64628837 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
**Closed issues:**
- Integration in error state when knative SinkBinding mode=inclusion [\#4119](https://github.com/apache/camel-k/issues/4119)
+- Camel K testing - official doc required [\#3848](https://github.com/apache/camel-k/issues/3848)
## [1.10.5-nightly](https://github.com/apache/camel-k/tree/1.10.5-nightly) (2023-03-13)