Fix apache#1654: disable sinkbinding in kameletbinding explicit uri

nicolaferraro · Dec 2, 2020 · 641974d · 641974d
1 parent 0eb3100
commit 641974d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 7 deletions.
diff --git a/deploy/resources.go b/deploy/resources.go
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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