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
commit 55ce3578b3bfb79a89ee5322a6e56d6459127cc4
Author: nicolaferraro <ni.ferr...@gmail.com>
AuthorDate: Wed Dec 2 11:58:49 2020 +0100
Fix #1654: disable sinkbinding in kameletbinding explicit uri
---
deploy/resources.go | 4 ++--
e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml | 2 +-
e2e/yaks/common/kamelet-binding/messages-channel.yaml | 2 +-
e2e/yaks/common/kamelet-binding/timer-source-binding.yaml | 2 +-
e2e/yaks/common/knative-sinkbinding/messages-channel.yaml | 2 +-
e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +-
pkg/util/bindings/bindings_test.go | 1 +
pkg/util/bindings/knative_uri.go | 1 +
8 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/deploy/resources.go b/deploy/resources.go
index a67c4fb..1056ca3 100644
--- a/deploy/resources.go
+++ b/deploy/resources.go
@@ -340,9 +340,9 @@ var assets = func() http.FileSystem {
"/traits.yaml": &vfsgen۰CompressedFileInfo{
name: "traits.yaml",
modTime: time.Time{},
- uncompressedSize: 33738,
+ uncompressedSize: 33838,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\xdc\xb6\xd6\xe0\xf7\xfe\x0a\xc2\xbb\x80\x3d\xc6\x48\x76\x7a\xd1\xdb\x5e\xef\x76\x0b\x37\x49\xef\x75\xda\x24\xde\x38\x6d\x77\xd1\xbd\xb8\xc3\x91\xce\xcc\x30\xa6\x48\x3d\x24\x35\xce\x74\xb1\xff\x7d\xc1\xc3\x57\x69\x64\x5b\x4e\xe3\xc2\x17\x78\x90\x0f\xb1\xc7\x12\x79\x78\x78\xde\xdf\xc6\x28\xca\x8c\x3e\xfb\xa2\x20\x82\x36\x70\x46\xe8\x6a\xc5\x04\x33\xbb\x2f\x08\x69\x39\x35\x2b\xa9\x9a\x33\xb2\xa2\x5c\x83\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6d\x6f\x1c\x37\xd2\xe0\xf7\xfc\x0a\x42\x77\x80\x34\xc2\x74\x4b\xce\x22\x9b\xac\xee\x72\x81\x62\x3b\xbb\x72\x62\x5b\x67\x39\xc9\x1d\x72\x8b\x1d\x4e\x77\xcd\x0c\x2d\x36\xd9\x0f\xc9\x1e\x79\x72\xb8\xff\x7e\x60\xf1\xb5\x7b\x5a\x52\xcb\xb1\x02\x2d\xf0\xc0\x1f\x2c\x8d\xba\x8b\xc5\x62\xbd\xbf\x70\x8c\xa2\xcc\xe8\xb3\x2f\x0a\x22\x68\x03\x67\x84\xae\x56\x4c\x30\xb3\xfb\x82\x90\x96\x53\xb3\x92\xaa\x39\x23\x2b\xca\x35\x
[...]
},
"/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{
name: "user-cluster-role.yaml",
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index 72f2e8e..237f8ca 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -23,7 +23,7 @@ spec:
source:
ref:
kind: InMemoryChannel
- apiVersion: messaging.knative.dev/v1beta1
+ apiVersion: messaging.knative.dev/v1
name: messages
sink:
ref:
diff --git a/e2e/yaks/common/kamelet-binding/messages-channel.yaml
b/e2e/yaks/common/kamelet-binding/messages-channel.yaml
index abd3483..c67517d 100644
--- a/e2e/yaks/common/kamelet-binding/messages-channel.yaml
+++ b/e2e/yaks/common/kamelet-binding/messages-channel.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: messaging.knative.dev/v1beta1
+apiVersion: messaging.knative.dev/v1
kind: InMemoryChannel
metadata:
name: messages
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index a47fdf6..536e632 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -31,5 +31,5 @@ spec:
sink:
ref:
kind: InMemoryChannel
- apiVersion: messaging.knative.dev/v1beta1
+ apiVersion: messaging.knative.dev/v1
name: messages
diff --git a/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
b/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
index abd3483..c67517d 100644
--- a/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/messages-channel.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: messaging.knative.dev/v1beta1
+apiVersion: messaging.knative.dev/v1
kind: InMemoryChannel
metadata:
name: messages
diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml
b/e2e/yaks/common/knative-sinkbinding/source.yaml
index 3e5179b..9ec23fa 100644
--- a/e2e/yaks/common/knative-sinkbinding/source.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/source.yaml
@@ -25,4 +25,4 @@
- transform:
simple: "${body.toUpperCase()}"
- to: "log:info"
- - to:
"knative:channel/messages?apiVersion=messaging.knative.dev/v1beta1&kind=InMemoryChannel"
+ - to:
"knative:channel/messages?apiVersion=messaging.knative.dev/v1&kind=InMemoryChannel"
diff --git a/pkg/util/bindings/bindings_test.go
b/pkg/util/bindings/bindings_test.go
index c283343..2648d07 100644
--- a/pkg/util/bindings/bindings_test.go
+++ b/pkg/util/bindings/bindings_test.go
@@ -146,6 +146,7 @@ func TestBindings(t *testing.T) {
},
uri: "knative:endpoint/sink?ce.override.ce-type=mytype",
traits: asTraitSpec("knative", map[string]interface{}{
+ "sinkBinding": false,
"configuration":
asKnativeConfig("https://myurl/hey";),
}),
},
diff --git a/pkg/util/bindings/knative_uri.go b/pkg/util/bindings/knative_uri.go
index 01cafa5..e5a1415 100644
--- a/pkg/util/bindings/knative_uri.go
+++ b/pkg/util/bindings/knative_uri.go
@@ -72,6 +72,7 @@ func (k KnativeURIBindingProvider) Translate(ctx
BindingContext, endpointType v1
return nil, err
}
knativeConfig["configuration"] = config
+ knativeConfig["sinkBinding"] = false
knativeConfigJSON, err := json.Marshal(knativeConfig)
if err != nil {
return nil, err
