You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/04/26 08:51:31 UTC
[camel-k] 15/18: chore(e2e): revert usage of KameletBinding
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 8072d0f999ca4227aa76c8185ee537608a901375
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Apr 5 12:22:09 2023 +0200
chore(e2e): revert usage of KameletBinding
This will need to be changed to Pipe as soon as the Yaks model is changed.
---
e2e/yaks/common/kamelet-beans/kamelet.feature | 4 ++--
.../kamelet-binding-autoload/kamelet-autoload-specific.feature | 10 +++++-----
.../common/kamelet-binding-autoload/kamelet-autoload.feature | 8 ++++----
e2e/yaks/common/kamelet-binding-broker/kamelet.feature | 2 +-
.../common/kamelet-binding-broker/logger-sink-binding.yaml | 4 ++--
.../common/kamelet-binding-broker/timer-source-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-binding-http/kamelet.feature | 2 +-
.../kamelet-binding-http/timer-source-binding-display.yaml | 4 ++--
.../kamelet-binding-property-encoding/properties-binding.yaml | 2 +-
.../kamelet-binding-property-encoding/properties.feature | 2 +-
e2e/yaks/common/kamelet-binding/kamelet.feature | 2 +-
e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-binding/timer-source-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-data-types/event-binding.yaml | 4 ++--
e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature | 4 ++--
e2e/yaks/common/kamelet-data-types/timer-to-log.yaml | 4 ++--
e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature | 4 ++--
e2e/yaks/common/kamelet-steps/steps-binding.feature | 2 +-
e2e/yaks/common/kamelet-steps/steps-binding.yaml | 4 ++--
e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +-
20 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/e2e/yaks/common/kamelet-beans/kamelet.feature b/e2e/yaks/common/kamelet-beans/kamelet.feature
index 25fcb9e97..892f534ef 100644
--- a/e2e/yaks/common/kamelet-beans/kamelet.feature
+++ b/e2e/yaks/common/kamelet-beans/kamelet.feature
@@ -9,7 +9,7 @@ Feature: Kamelets can declare local beans
Scenario: Kamelets templates can use beans
Given bind Kamelet beans-source to uri log:info
- When create Binding binding
- Then Binding binding should be available
+ When create KameletBinding binding
+ Then KameletBinding binding should be available
Then Camel K integration binding should be running
Then Camel K integration binding should print Bean time is 0!
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
index 6cc3c633a..635bbee13 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature
@@ -7,17 +7,17 @@ Feature: Camel K can load specific secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding can load specific settings for Kamelet
+ Scenario: KameletBinding can load specific settings for Kamelet
Given create Kubernetes service stub-service-2 with target port 8080
And bind Kamelet timer-source to uri http://stub-service-2.${YAKS_NAMESPACE}.svc.cluster.local/specific
- And Binding source properties
+ And KameletBinding source properties
| id | specific |
- When create Binding binding-specific
- Then Binding binding-specific should be available
+ When create KameletBinding binding-specific
+ Then KameletBinding binding-specific should be available
Scenario: Verify specific binding
Given HTTP server "stub-service-2"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: specific
And receive POST /specific
- And delete Binding binding-specific
+ And delete KameletBinding binding-specific
diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
index 0c567d1e6..d5cc6ba81 100644
--- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
+++ b/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature
@@ -7,15 +7,15 @@ Feature: Camel K can load default secrets for Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding can load default settings for Kamelet
+ Scenario: KameletBinding can load default settings for Kamelet
Given create Kubernetes service stub-service with target port 8080
And bind Kamelet timer-source to uri http://stub-service.${YAKS_NAMESPACE}.svc.cluster.local/default
- When create Binding binding
- Then Binding binding should be available
+ When create KameletBinding binding
+ Then KameletBinding binding should be available
Scenario: Verify default binding
Given HTTP server "stub-service"
And HTTP server timeout is 600000 ms
Then expect HTTP request body: default
And receive POST /default
- And delete Binding binding
+ And delete KameletBinding binding
diff --git a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
index 110cbd889..c4d10c636 100644
--- a/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding-broker/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets to the broker
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Sending event to the custom broker with Binding
+ Scenario: Sending event to the custom broker with KameletBinding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Custom Event from sample-broker
diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
index d34af676b..523f21e58 100644
--- a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
index 00cbbfef4..585be4820 100644
--- a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-broker/timer-source-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding-http/kamelet.feature b/e2e/yaks/common/kamelet-binding-http/kamelet.feature
index 07a1ed6e7..dbe5b8304 100644
--- a/e2e/yaks/common/kamelet-binding-http/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding-http/kamelet.feature
@@ -5,7 +5,7 @@ Feature: Camel K can bind Kamelets via HTTP
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Binding to a HTTP URI should use CloudEvents
+ Scenario: KameletBinding to a HTTP URI should use CloudEvents
Given Camel K integration display is running
Then Camel K integration display should print type: org.apache.camel.event
Then Camel K integration display should print Hello
diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
index 68d5ce441..70c9d096d 100644
--- a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
+++ b/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding-display
spec:
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
index cbdbaea61..aa1823da0 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-kind: Binding
+kind: KameletBinding
apiVersion: camel.apache.org/v1
metadata:
name: properties-binding
diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
index 7b1b961f8..c3afc634f 100644
--- a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
+++ b/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature
@@ -23,4 +23,4 @@ Feature: Ensure that Kamelets support multiline configuration
"""
And expect HTTP request header: Content-Type="application/json;charset=UTF-8"
And receive POST /events
- And delete Binding properties-binding
+ And delete KameletBinding properties-binding
diff --git a/e2e/yaks/common/kamelet-binding/kamelet.feature b/e2e/yaks/common/kamelet-binding/kamelet.feature
index c8e1c1402..107a80c92 100644
--- a/e2e/yaks/common/kamelet-binding/kamelet.feature
+++ b/e2e/yaks/common/kamelet-binding/kamelet.feature
@@ -5,6 +5,6 @@ Feature: Camel K can bind Kamelets
| maxAttempts | 40 |
| delayBetweenAttempts | 3000 |
- Scenario: Running integration using a simple Kamelet with Binding
+ Scenario: Running integration using a simple Kamelet with KameletBinding
Given Camel K integration logger-sink-binding is running
Then Camel K integration logger-sink-binding should print message: Hello Kamelets
diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
index c29fe5051..8b892b67b 100644
--- a/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/logger-sink-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: logger-sink-binding
spec:
diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
index eea5967c1..7752e3347 100644
--- a/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
+++ b/e2e/yaks/common/kamelet-binding/timer-source-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-source-binding
spec:
diff --git a/e2e/yaks/common/kamelet-data-types/event-binding.yaml b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
index 880ffe8ed..17f3079c9 100644
--- a/e2e/yaks/common/kamelet-data-types/event-binding.yaml
+++ b/e2e/yaks/common/kamelet-data-types/event-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: event-binding
spec:
diff --git a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
index 2ea9c2ff9..443366db0 100644
--- a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
+++ b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature
@@ -6,13 +6,13 @@ Feature: Kamelets with data types
| delayBetweenAttempts | 4000 |
Scenario: Kamelet event data type conversion
- Given load Binding event-binding.yaml
+ Given load KameletBinding event-binding.yaml
Given Camel K integration event-binding is running
Then Camel K integration event-binding should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration event-binding should print BodyType: String, Body: Hello from Camel K!
Scenario: Kamelet timer-to-log conversion
- Given load Binding timer-to-log.yaml
+ Given load KameletBinding timer-to-log.yaml
Given Camel K integration timer-to-log is running
Then Camel K integration timer-to-log should print BodyType: byte[], Body: Hello from Camel K!
Then Camel K integration timer-to-log should print BodyType: String, Body: Hello from Camel K!
diff --git a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
index c145bb894..38c258480 100644
--- a/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
+++ b/e2e/yaks/common/kamelet-data-types/timer-to-log.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: timer-to-log
spec:
diff --git a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
index 7815a17d3..6f6b42afc 100644
--- a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
+++ b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature
@@ -22,7 +22,7 @@ from:
Scenario: Bind Kamelet to service
Given create Kubernetes service greeting-service with target port 8080
And bind Kamelet no-props-source to uri log:info
- When create Binding no-props-source-uri
- Then Binding no-props-source-uri should be available
+ When create KameletBinding no-props-source-uri
+ Then KameletBinding no-props-source-uri should be available
Then Camel K integration no-props-source-uri should be running
Then Camel K integration no-props-source-uri should print Hello World
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.feature b/e2e/yaks/common/kamelet-steps/steps-binding.feature
index 35d71fced..a9980cfc3 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.feature
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.feature
@@ -1,4 +1,4 @@
-Feature: Bindings can have multiple processing steps
+Feature: KameletBindings can have multiple processing steps
Background:
Given Camel K resource polling configuration
diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
index ceb4e6b2b..ec9946f3a 100644
--- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml
+++ b/e2e/yaks/common/kamelet-steps/steps-binding.yaml
@@ -15,8 +15,8 @@
# limitations under the License.
# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Binding
+apiVersion: camel.apache.org/v1alpha1
+kind: KameletBinding
metadata:
name: steps-binding
spec:
diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml b/e2e/yaks/common/knative-sinkbinding/source.yaml
index 9ec23fa81..f37427147 100644
--- a/e2e/yaks/common/knative-sinkbinding/source.yaml
+++ b/e2e/yaks/common/knative-sinkbinding/source.yaml
@@ -21,7 +21,7 @@
period: "1000"
steps:
- set-body:
- constant: "Hello SinkBinding !!!"
+ constant: "Hello SinkKameletBinding !!!"
- transform:
simple: "${body.toUpperCase()}"
- to: "log:info"