From 6d0e38cb1bd19fd8f9b36e9ffdedf462f2a464fe Mon Sep 17 00:00:00 2001 From: Thomas Diesler Date: Thu, 13 Jun 2024 09:22:54 +0200 Subject: [PATCH] (#5490) Move deprecated v1alpha1.KameletBinding tests to v1.Pipe --- .../apache-kamelet-catalog/yaks-config.yaml | 4 ---- .../common/kamelet-beans/kamelet-beans.feature | 4 ++-- .../kamelet-binding-broker.feature | 14 -------------- .../kamelet-binding/kamelet-binding.feature | 15 --------------- .../{event-binding.yaml => event-pipe.yaml} | 8 ++++---- .../kamelet-data-types.feature | 14 +++++++------- .../common/kamelet-data-types/timer-to-log.yaml | 4 ++-- .../common/kamelet-data-types/yaks-config.yaml | 2 +- ...ops.feature => kamelet-no-properties.feature} | 6 +++--- .../kamelet-pipe-autoload-specific.feature} | 10 +++++----- .../kamelet-pipe-autoload.feature} | 8 ++++---- .../secret-default.yaml | 0 .../secret-specific.yaml | 0 .../timer-source.kamelet.yaml | 0 .../yaks-config.yaml | 0 .../kamelet-pipe-broker.feature | 14 ++++++++++++++ .../logger-sink-pipe.yaml} | 6 +++--- .../logger-sink.kamelet.yaml | 0 .../sample-broker.yaml | 0 .../timer-source-pipe.yaml} | 6 +++--- .../timer-source.kamelet.yaml | 0 .../yaks-config.yaml | 8 ++++---- .../display.yaml | 0 .../kamelet-pipe-http.feature} | 4 ++-- .../timer-source-pipe.yaml} | 2 +- .../timer-source.kamelet.yaml | 0 .../yaks-config.yaml | 8 ++------ .../kamelet-pipe-properties.feature} | 4 ++-- .../properties-pipe.yaml} | 7 ++++--- .../timer-source.kamelet.yaml | 0 .../yaks-config.yaml | 3 +-- .../common/kamelet-pipe/kamelet-pipe.feature | 16 ++++++++++++++++ .../logger-sink-pipe.yaml} | 6 +++--- .../logger-sink.kamelet.yaml | 0 .../messages-channel.yaml | 0 .../timer-source-pipe.yaml} | 6 +++--- .../timer-source.kamelet.yaml | 0 .../yaks-config.yaml | 8 ++++---- .../common/kamelet-steps/kamelet-steps.feature | 13 +++++++++++++ .../common/kamelet-steps/steps-binding.feature | 13 ------------- .../{steps-binding.yaml => steps-pipe.yaml} | 6 +++--- e2e/yaks/common/kamelet-steps/yaks-config.yaml | 4 ++-- e2e/yaks/common/kamelet/yaks-config.yaml | 4 ---- .../common/knative-sinkbinding/yaks-config.yaml | 4 ---- 44 files changed, 108 insertions(+), 123 deletions(-) delete mode 100644 e2e/yaks/common/kamelet-binding-broker/kamelet-binding-broker.feature delete mode 100644 e2e/yaks/common/kamelet-binding/kamelet-binding.feature rename e2e/yaks/common/kamelet-data-types/{event-binding.yaml => event-pipe.yaml} (92%) rename e2e/yaks/common/kamelet-no-properties/{kamelet-no-props.feature => kamelet-no-properties.feature} (84%) rename e2e/yaks/common/{kamelet-binding-autoload/kamelet-autoload-specific.feature => kamelet-pipe-autoload/kamelet-pipe-autoload-specific.feature} (72%) rename e2e/yaks/common/{kamelet-binding-autoload/kamelet-autoload.feature => kamelet-pipe-autoload/kamelet-pipe-autoload.feature} (79%) rename e2e/yaks/common/{kamelet-binding-autoload => kamelet-pipe-autoload}/secret-default.yaml (100%) rename e2e/yaks/common/{kamelet-binding-autoload => kamelet-pipe-autoload}/secret-specific.yaml (100%) rename e2e/yaks/common/{kamelet-binding-autoload => kamelet-pipe-autoload}/timer-source.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding-autoload => kamelet-pipe-autoload}/yaks-config.yaml (100%) create mode 100644 e2e/yaks/common/kamelet-pipe-broker/kamelet-pipe-broker.feature rename e2e/yaks/common/{kamelet-binding-broker/logger-sink-binding-br.yaml => kamelet-pipe-broker/logger-sink-pipe.yaml} (93%) rename e2e/yaks/common/{kamelet-binding-broker => kamelet-pipe-broker}/logger-sink.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding-broker => kamelet-pipe-broker}/sample-broker.yaml (100%) rename e2e/yaks/common/{kamelet-binding-broker/timer-source-binding-br.yaml => kamelet-pipe-broker/timer-source-pipe.yaml} (93%) rename e2e/yaks/common/{kamelet-binding-broker => kamelet-pipe-broker}/timer-source.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding-broker => kamelet-pipe-broker}/yaks-config.yaml (78%) rename e2e/yaks/common/{kamelet-binding-http => kamelet-pipe-http}/display.yaml (100%) rename e2e/yaks/common/{kamelet-binding-http/kamelet-binding-http.feature => kamelet-pipe-http/kamelet-pipe-http.feature} (78%) rename e2e/yaks/common/{kamelet-binding-http/timer-source-binding-display.yaml => kamelet-pipe-http/timer-source-pipe.yaml} (97%) rename e2e/yaks/common/{kamelet-binding-http => kamelet-pipe-http}/timer-source.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding-http => kamelet-pipe-http}/yaks-config.yaml (78%) rename e2e/yaks/common/{kamelet-binding-property-encoding/properties.feature => kamelet-pipe-properties/kamelet-pipe-properties.feature} (87%) rename e2e/yaks/common/{kamelet-binding-property-encoding/properties-binding.yaml => kamelet-pipe-properties/properties-pipe.yaml} (93%) rename e2e/yaks/common/{kamelet-binding-property-encoding => kamelet-pipe-properties}/timer-source.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding-property-encoding => kamelet-pipe-properties}/yaks-config.yaml (94%) create mode 100644 e2e/yaks/common/kamelet-pipe/kamelet-pipe.feature rename e2e/yaks/common/{kamelet-binding/logger-sink-binding-kb.yaml => kamelet-pipe/logger-sink-pipe.yaml} (92%) rename e2e/yaks/common/{kamelet-binding => kamelet-pipe}/logger-sink.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding => kamelet-pipe}/messages-channel.yaml (100%) rename e2e/yaks/common/{kamelet-binding/timer-source-binding-kb.yaml => kamelet-pipe/timer-source-pipe.yaml} (93%) rename e2e/yaks/common/{kamelet-binding => kamelet-pipe}/timer-source.kamelet.yaml (100%) rename e2e/yaks/common/{kamelet-binding => kamelet-pipe}/yaks-config.yaml (78%) create mode 100644 e2e/yaks/common/kamelet-steps/kamelet-steps.feature delete mode 100644 e2e/yaks/common/kamelet-steps/steps-binding.feature rename e2e/yaks/common/kamelet-steps/{steps-binding.yaml => steps-pipe.yaml} (94%) diff --git a/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml b/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml index a9fb049dec..0ce1a88447 100644 --- a/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml +++ b/e2e/yaks/common/apache-kamelet-catalog/yaks-config.yaml @@ -15,10 +15,6 @@ # limitations under the License. # --------------------------------------------------------------------------- -# Run integration test: -# -# yaks run -v ./e2e/yaks/common/apache-kamelet-catalog/kamelet.feature - config: namespace: temporary: true diff --git a/e2e/yaks/common/kamelet-beans/kamelet-beans.feature b/e2e/yaks/common/kamelet-beans/kamelet-beans.feature index 56432a6242..7e1d0055d4 100644 --- a/e2e/yaks/common/kamelet-beans/kamelet-beans.feature +++ b/e2e/yaks/common/kamelet-beans/kamelet-beans.feature @@ -7,7 +7,7 @@ Feature: Kamelets can declare local beans Scenario: Kamelets templates can use beans Given bind Kamelet beans-source to uri log:info - When create KameletBinding binding - Then KameletBinding binding should be available + When create Pipe binding + Then Pipe 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-broker/kamelet-binding-broker.feature b/e2e/yaks/common/kamelet-binding-broker/kamelet-binding-broker.feature deleted file mode 100644 index 2282bb61df..0000000000 --- a/e2e/yaks/common/kamelet-binding-broker/kamelet-binding-broker.feature +++ /dev/null @@ -1,14 +0,0 @@ -Feature: Camel K can bind Kamelets to the broker - - Background: - Given Camel K resource polling configuration - | maxAttempts | 40 | - | delayBetweenAttempts | 3000 | - - Scenario: Sending event to the custom broker with KameletBinding - Given Camel K integration logger-sink-binding-br is running - Then Camel K integration logger-sink-binding-br should print message: Hello Custom Event from sample-broker - - Scenario: Remove resources - Given delete Camel K integration timer-source-binding-br - Given delete Camel K integration logger-sink-binding-br diff --git a/e2e/yaks/common/kamelet-binding/kamelet-binding.feature b/e2e/yaks/common/kamelet-binding/kamelet-binding.feature deleted file mode 100644 index 6e0cf8c916..0000000000 --- a/e2e/yaks/common/kamelet-binding/kamelet-binding.feature +++ /dev/null @@ -1,15 +0,0 @@ -Feature: Camel K can bind Kamelets - - Background: - Given Camel K resource polling configuration - | maxAttempts | 40 | - | delayBetweenAttempts | 3000 | - - Scenario: Running integration using a simple Kamelet with KameletBinding - Given Camel K integration logger-sink-binding-kb is running - Then Camel K integration logger-sink-binding-kb should print message: Hello Kamelets - - Scenario: Remove resources - Given delete Camel K integration timer-source-binding-kb - Given delete Camel K integration logger-sink-binding-kb - diff --git a/e2e/yaks/common/kamelet-data-types/event-binding.yaml b/e2e/yaks/common/kamelet-data-types/event-pipe.yaml similarity index 92% rename from e2e/yaks/common/kamelet-data-types/event-binding.yaml rename to e2e/yaks/common/kamelet-data-types/event-pipe.yaml index aa19af8463..fbcbb629fb 100644 --- a/e2e/yaks/common/kamelet-data-types/event-binding.yaml +++ b/e2e/yaks/common/kamelet-data-types/event-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: event-binding + name: event-pipe spec: source: ref: @@ -40,4 +40,4 @@ spec: name: event-sink dataTypes: in: - format: "text-plain" \ No newline at end of file + format: "text-plain" 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 b6f1093c1b..759889d490 100644 --- a/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature +++ b/e2e/yaks/common/kamelet-data-types/kamelet-data-types.feature @@ -6,17 +6,17 @@ Feature: Kamelets with data types | delayBetweenAttempts | 4000 | Scenario: Kamelet event data type conversion - 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! + Given load Pipe event-pipe.yaml + Given Camel K integration event-pipe is running + Then Camel K integration event-pipe should print BodyType: byte[], Body: Hello from Camel K! + Then Camel K integration event-pipe should print BodyType: String, Body: Hello from Camel K! Scenario: Kamelet timer-to-log conversion - Given load KameletBinding timer-to-log.yaml + Given load Pipe 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! Scenario: Remove resources - Given delete KameletBinding event-binding - Given delete KameletBinding timer-to-log + Given delete Pipe event-pipe + Given delete Pipe timer-to-log 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 4f8b026d64..763bc05fc7 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/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: name: timer-to-log spec: diff --git a/e2e/yaks/common/kamelet-data-types/yaks-config.yaml b/e2e/yaks/common/kamelet-data-types/yaks-config.yaml index 74f69461dd..41f5d897e7 100644 --- a/e2e/yaks/common/kamelet-data-types/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-data-types/yaks-config.yaml @@ -29,7 +29,7 @@ config: - name: INTEGRATION_LOGS level: INFO resources: - - event-binding.yaml + - event-pipe.yaml - timer-to-log.yaml pre: - name: installation diff --git a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature b/e2e/yaks/common/kamelet-no-properties/kamelet-no-properties.feature similarity index 84% rename from e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature rename to e2e/yaks/common/kamelet-no-properties/kamelet-no-properties.feature index 3a07d7d49b..993a24e329 100644 --- a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature +++ b/e2e/yaks/common/kamelet-no-properties/kamelet-no-properties.feature @@ -22,11 +22,11 @@ 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 KameletBinding no-props-source-uri - Then KameletBinding no-props-source-uri should be available + When create Pipe no-props-source-uri + Then Pipe 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 Scenario: Remove resources Given delete Kubernetes service greeting-service - Given delete KameletBinding no-props-source-uri + Given delete Pipe no-props-source-uri diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature b/e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload-specific.feature similarity index 72% rename from e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature rename to e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload-specific.feature index 635bbee133..c5401cf6d8 100644 --- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload-specific.feature +++ b/e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload-specific.feature @@ -7,17 +7,17 @@ Feature: Camel K can load specific secrets for Kamelets | maxAttempts | 40 | | delayBetweenAttempts | 3000 | - Scenario: KameletBinding can load specific settings for Kamelet + Scenario: Pipe 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 KameletBinding source properties + And Pipe source properties | id | specific | - When create KameletBinding binding-specific - Then KameletBinding binding-specific should be available + When create Pipe binding-specific + Then Pipe 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 KameletBinding binding-specific + And delete Pipe binding-specific diff --git a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature b/e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload.feature similarity index 79% rename from e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature rename to e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload.feature index 084c860760..6d79c87669 100644 --- a/e2e/yaks/common/kamelet-binding-autoload/kamelet-autoload.feature +++ b/e2e/yaks/common/kamelet-pipe-autoload/kamelet-pipe-autoload.feature @@ -7,11 +7,11 @@ Feature: Camel K can load default secrets for Kamelets | maxAttempts | 40 | | delayBetweenAttempts | 3000 | - Scenario: KameletBinding can load default settings for Kamelet + Scenario: Pipe 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 KameletBinding binding - Then KameletBinding binding should be available + When create Pipe binding + Then Pipe binding should be available Scenario: Verify default binding Given HTTP server "stub-service" @@ -21,4 +21,4 @@ Feature: Camel K can load default secrets for Kamelets Scenario: Remove resources Given delete Kubernetes service stub-service - Given delete KameletBinding binding + Given delete Pipe binding diff --git a/e2e/yaks/common/kamelet-binding-autoload/secret-default.yaml b/e2e/yaks/common/kamelet-pipe-autoload/secret-default.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-autoload/secret-default.yaml rename to e2e/yaks/common/kamelet-pipe-autoload/secret-default.yaml diff --git a/e2e/yaks/common/kamelet-binding-autoload/secret-specific.yaml b/e2e/yaks/common/kamelet-pipe-autoload/secret-specific.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-autoload/secret-specific.yaml rename to e2e/yaks/common/kamelet-pipe-autoload/secret-specific.yaml diff --git a/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-pipe-autoload/timer-source.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe-autoload/timer-source.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml b/e2e/yaks/common/kamelet-pipe-autoload/yaks-config.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-autoload/yaks-config.yaml rename to e2e/yaks/common/kamelet-pipe-autoload/yaks-config.yaml diff --git a/e2e/yaks/common/kamelet-pipe-broker/kamelet-pipe-broker.feature b/e2e/yaks/common/kamelet-pipe-broker/kamelet-pipe-broker.feature new file mode 100644 index 0000000000..5e8a818699 --- /dev/null +++ b/e2e/yaks/common/kamelet-pipe-broker/kamelet-pipe-broker.feature @@ -0,0 +1,14 @@ +Feature: Camel K can bind Kamelets to the broker + + Background: + Given Camel K resource polling configuration + | maxAttempts | 40 | + | delayBetweenAttempts | 3000 | + + Scenario: Sending event to the custom broker with Pipe + Given Camel K integration logger-sink-pipe is running + Then Camel K integration logger-sink-pipe should print message: Hello Custom Event from sample-broker + + Scenario: Remove resources + Given delete Camel K integration timer-source-pipe + Given delete Camel K integration logger-sink-pipe diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding-br.yaml b/e2e/yaks/common/kamelet-pipe-broker/logger-sink-pipe.yaml similarity index 93% rename from e2e/yaks/common/kamelet-binding-broker/logger-sink-binding-br.yaml rename to e2e/yaks/common/kamelet-pipe-broker/logger-sink-pipe.yaml index 0638a074c6..faada50723 100644 --- a/e2e/yaks/common/kamelet-binding-broker/logger-sink-binding-br.yaml +++ b/e2e/yaks/common/kamelet-pipe-broker/logger-sink-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: logger-sink-binding-br + name: logger-sink-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-pipe-broker/logger-sink.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-broker/logger-sink.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe-broker/logger-sink.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding-broker/sample-broker.yaml b/e2e/yaks/common/kamelet-pipe-broker/sample-broker.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-broker/sample-broker.yaml rename to e2e/yaks/common/kamelet-pipe-broker/sample-broker.yaml diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding-br.yaml b/e2e/yaks/common/kamelet-pipe-broker/timer-source-pipe.yaml similarity index 93% rename from e2e/yaks/common/kamelet-binding-broker/timer-source-binding-br.yaml rename to e2e/yaks/common/kamelet-pipe-broker/timer-source-pipe.yaml index 0231d68f54..1faf369d19 100644 --- a/e2e/yaks/common/kamelet-binding-broker/timer-source-binding-br.yaml +++ b/e2e/yaks/common/kamelet-pipe-broker/timer-source-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: timer-source-binding-br + name: timer-source-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-pipe-broker/timer-source.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe-broker/timer-source.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml b/e2e/yaks/common/kamelet-pipe-broker/yaks-config.yaml similarity index 78% rename from e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml rename to e2e/yaks/common/kamelet-pipe-broker/yaks-config.yaml index ac1307831f..ed325e30c9 100644 --- a/e2e/yaks/common/kamelet-binding-broker/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-pipe-broker/yaks-config.yaml @@ -25,10 +25,10 @@ pre: kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE kubectl apply -f logger-sink.kamelet.yaml -n $YAKS_NAMESPACE - kubectl apply -f timer-source-binding-br.yaml -n $YAKS_NAMESPACE - kubectl apply -f logger-sink-binding-br.yaml -n $YAKS_NAMESPACE - kubectl wait kameletbinding timer-source-binding-br --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE - kubectl wait kameletbinding logger-sink-binding-br --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE + kubectl apply -f timer-source-pipe.yaml -n $YAKS_NAMESPACE + kubectl apply -f logger-sink-pipe.yaml -n $YAKS_NAMESPACE + kubectl wait pipe timer-source-pipe --for=condition=Ready --timeout=5m -n $YAKS_NAMESPACE + kubectl wait pipe logger-sink-pipe --for=condition=Ready --timeout=5m -n $YAKS_NAMESPACE post: - name: print dump if: env:CI=true && failure() diff --git a/e2e/yaks/common/kamelet-binding-http/display.yaml b/e2e/yaks/common/kamelet-pipe-http/display.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-http/display.yaml rename to e2e/yaks/common/kamelet-pipe-http/display.yaml diff --git a/e2e/yaks/common/kamelet-binding-http/kamelet-binding-http.feature b/e2e/yaks/common/kamelet-pipe-http/kamelet-pipe-http.feature similarity index 78% rename from e2e/yaks/common/kamelet-binding-http/kamelet-binding-http.feature rename to e2e/yaks/common/kamelet-pipe-http/kamelet-pipe-http.feature index 7f1ea9049c..ee9bb969e6 100644 --- a/e2e/yaks/common/kamelet-binding-http/kamelet-binding-http.feature +++ b/e2e/yaks/common/kamelet-pipe-http/kamelet-pipe-http.feature @@ -5,11 +5,11 @@ Feature: Camel K can bind Kamelets via HTTP | maxAttempts | 40 | | delayBetweenAttempts | 3000 | - Scenario: KameletBinding to a HTTP URI should use CloudEvents + Scenario: Pipe 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 Scenario: Remove resources Given delete Camel K integration display - Given delete KameletBinding timer-source-binding-display + Given delete Pipe timer-source-pipe diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml b/e2e/yaks/common/kamelet-pipe-http/timer-source-pipe.yaml similarity index 97% rename from e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml rename to e2e/yaks/common/kamelet-pipe-http/timer-source-pipe.yaml index c1e3d5bff1..5d81929b6e 100644 --- a/e2e/yaks/common/kamelet-binding-http/timer-source-binding-display.yaml +++ b/e2e/yaks/common/kamelet-pipe-http/timer-source-pipe.yaml @@ -18,7 +18,7 @@ apiVersion: camel.apache.org/v1 kind: Pipe metadata: - name: timer-source-binding-display + name: timer-source-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-pipe-http/timer-source.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe-http/timer-source.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml b/e2e/yaks/common/kamelet-pipe-http/yaks-config.yaml similarity index 78% rename from e2e/yaks/common/kamelet-binding-http/yaks-config.yaml rename to e2e/yaks/common/kamelet-pipe-http/yaks-config.yaml index f306f8be12..8d6a2760ce 100644 --- a/e2e/yaks/common/kamelet-binding-http/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-pipe-http/yaks-config.yaml @@ -15,10 +15,6 @@ # limitations under the License. # --------------------------------------------------------------------------- -# Run integration test: -# -# yaks run -v ./e2e/yaks/common/kamelet-binding-http/kamelet-binding-http.feature - config: namespace: temporary: true @@ -28,8 +24,8 @@ pre: kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE kamel run display.yaml -w -n $YAKS_NAMESPACE - cat timer-source-binding-display.yaml | sed 's/{namespace}/'"${YAKS_NAMESPACE}"'/' | kubectl apply -n $YAKS_NAMESPACE -f - - kubectl wait pipe timer-source-binding-display --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE + cat timer-source-pipe.yaml | sed 's/{namespace}/'"${YAKS_NAMESPACE}"'/' | kubectl apply -n $YAKS_NAMESPACE -f - + kubectl wait pipe timer-source-pipe --for=condition=Ready --timeout=15m -n $YAKS_NAMESPACE post: - name: print dump if: env:CI=true && failure() diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature b/e2e/yaks/common/kamelet-pipe-properties/kamelet-pipe-properties.feature similarity index 87% rename from e2e/yaks/common/kamelet-binding-property-encoding/properties.feature rename to e2e/yaks/common/kamelet-pipe-properties/kamelet-pipe-properties.feature index f6f28f5231..601a7259df 100644 --- a/e2e/yaks/common/kamelet-binding-property-encoding/properties.feature +++ b/e2e/yaks/common/kamelet-pipe-properties/kamelet-pipe-properties.feature @@ -9,7 +9,7 @@ Feature: Ensure that Kamelets support multiline configuration Scenario: Wait for binding to start Given create Kubernetes service probe-service with target port 8080 - Then Camel K integration properties-binding should be running + Then Camel K integration properties-pipe should be running Scenario: Verify binding Given HTTP server "probe-service" @@ -26,4 +26,4 @@ Feature: Ensure that Kamelets support multiline configuration Scenario: Remove resources Given delete Kubernetes service probe-service - Given delete KameletBinding properties-binding + Given delete Pipe properties-pipe diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml b/e2e/yaks/common/kamelet-pipe-properties/properties-pipe.yaml similarity index 93% rename from e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml rename to e2e/yaks/common/kamelet-pipe-properties/properties-pipe.yaml index f7f9f069eb..63bb4532c8 100644 --- a/e2e/yaks/common/kamelet-binding-property-encoding/properties-binding.yaml +++ b/e2e/yaks/common/kamelet-pipe-properties/properties-pipe.yaml @@ -15,10 +15,11 @@ # limitations under the License. # --------------------------------------------------------------------------- -kind: KameletBinding -apiVersion: camel.apache.org/v1alpha1 +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: properties-binding + name: properties-pipe + spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-pipe-properties/timer-source.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe-properties/timer-source.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml b/e2e/yaks/common/kamelet-pipe-properties/yaks-config.yaml similarity index 94% rename from e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml rename to e2e/yaks/common/kamelet-pipe-properties/yaks-config.yaml index 112a531cb8..4d00709dce 100644 --- a/e2e/yaks/common/kamelet-binding-property-encoding/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-pipe-properties/yaks-config.yaml @@ -22,8 +22,7 @@ pre: - name: installation run: | kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE - - kubectl apply -f properties-binding.yaml -n $YAKS_NAMESPACE + kubectl apply -f properties-pipe.yaml -n $YAKS_NAMESPACE post: - name: print dump if: env:CI=true && failure() diff --git a/e2e/yaks/common/kamelet-pipe/kamelet-pipe.feature b/e2e/yaks/common/kamelet-pipe/kamelet-pipe.feature new file mode 100644 index 0000000000..3fa655523d --- /dev/null +++ b/e2e/yaks/common/kamelet-pipe/kamelet-pipe.feature @@ -0,0 +1,16 @@ +Feature: Camel K can bind Kamelets + + Background: + Given Camel K resource polling configuration + | maxAttempts | 40 | + | delayBetweenAttempts | 3000 | + + Scenario: Running integration using a simple Kamelet with Pipes + Given Camel K integration timer-source-pipe is running + Given Camel K integration logger-sink-pipe is running + Then Camel K integration logger-sink-pipe should print message: Hello Kamelets + + Scenario: Remove resources + Given delete Camel K integration timer-source-pipe + Given delete Camel K integration logger-sink-pipe + diff --git a/e2e/yaks/common/kamelet-binding/logger-sink-binding-kb.yaml b/e2e/yaks/common/kamelet-pipe/logger-sink-pipe.yaml similarity index 92% rename from e2e/yaks/common/kamelet-binding/logger-sink-binding-kb.yaml rename to e2e/yaks/common/kamelet-pipe/logger-sink-pipe.yaml index 908a3dd510..10aa553d18 100644 --- a/e2e/yaks/common/kamelet-binding/logger-sink-binding-kb.yaml +++ b/e2e/yaks/common/kamelet-pipe/logger-sink-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: logger-sink-binding-kb + name: logger-sink-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml b/e2e/yaks/common/kamelet-pipe/logger-sink.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding/logger-sink.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe/logger-sink.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding/messages-channel.yaml b/e2e/yaks/common/kamelet-pipe/messages-channel.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding/messages-channel.yaml rename to e2e/yaks/common/kamelet-pipe/messages-channel.yaml diff --git a/e2e/yaks/common/kamelet-binding/timer-source-binding-kb.yaml b/e2e/yaks/common/kamelet-pipe/timer-source-pipe.yaml similarity index 93% rename from e2e/yaks/common/kamelet-binding/timer-source-binding-kb.yaml rename to e2e/yaks/common/kamelet-pipe/timer-source-pipe.yaml index d8d3683ffd..a3e5ced7be 100644 --- a/e2e/yaks/common/kamelet-binding/timer-source-binding-kb.yaml +++ b/e2e/yaks/common/kamelet-pipe/timer-source-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: timer-source-binding-kb + name: timer-source-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-pipe/timer-source.kamelet.yaml similarity index 100% rename from e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml rename to e2e/yaks/common/kamelet-pipe/timer-source.kamelet.yaml diff --git a/e2e/yaks/common/kamelet-binding/yaks-config.yaml b/e2e/yaks/common/kamelet-pipe/yaks-config.yaml similarity index 78% rename from e2e/yaks/common/kamelet-binding/yaks-config.yaml rename to e2e/yaks/common/kamelet-pipe/yaks-config.yaml index f809331867..88022d00bb 100644 --- a/e2e/yaks/common/kamelet-binding/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-pipe/yaks-config.yaml @@ -26,10 +26,10 @@ pre: kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE kubectl apply -f logger-sink.kamelet.yaml -n $YAKS_NAMESPACE - kubectl apply -f timer-source-binding-kb.yaml -n $YAKS_NAMESPACE - kubectl apply -f logger-sink-binding-kb.yaml -n $YAKS_NAMESPACE - kubectl wait kameletbinding timer-source-binding-kb --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE - kubectl wait kameletbinding logger-sink-binding-kb --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE + kubectl apply -f timer-source-pipe.yaml -n $YAKS_NAMESPACE + kubectl apply -f logger-sink-pipe.yaml -n $YAKS_NAMESPACE + kubectl wait pipe timer-source-pipe --for=condition=Ready --timeout=5m -n $YAKS_NAMESPACE + kubectl wait pipe logger-sink-pipe --for=condition=Ready --timeout=5m -n $YAKS_NAMESPACE post: - name: print dump if: env:CI=true && failure() diff --git a/e2e/yaks/common/kamelet-steps/kamelet-steps.feature b/e2e/yaks/common/kamelet-steps/kamelet-steps.feature new file mode 100644 index 0000000000..0863609fa6 --- /dev/null +++ b/e2e/yaks/common/kamelet-steps/kamelet-steps.feature @@ -0,0 +1,13 @@ +Feature: Pipe can have multiple processing steps + + Background: + Given Camel K resource polling configuration + | maxAttempts | 40 | + | delayBetweenAttempts | 3000 | + + Scenario: Data is transformed by the steps + Given Camel K integration steps-pipe is running + Then Camel K integration steps-pipe should print Hello Apache Camel + + Scenario: Remove resources + Given delete Camel K integration steps-pipe diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.feature b/e2e/yaks/common/kamelet-steps/steps-binding.feature deleted file mode 100644 index c19c446c7e..0000000000 --- a/e2e/yaks/common/kamelet-steps/steps-binding.feature +++ /dev/null @@ -1,13 +0,0 @@ -Feature: KameletBindings can have multiple processing steps - - Background: - Given Camel K resource polling configuration - | maxAttempts | 40 | - | delayBetweenAttempts | 3000 | - - Scenario: Data is transformed by the steps - Given Camel K integration steps-binding is running - Then Camel K integration steps-binding should print Hello Apache Camel - - Scenario: Remove resources - Given delete Camel K integration steps-binding diff --git a/e2e/yaks/common/kamelet-steps/steps-binding.yaml b/e2e/yaks/common/kamelet-steps/steps-pipe.yaml similarity index 94% rename from e2e/yaks/common/kamelet-steps/steps-binding.yaml rename to e2e/yaks/common/kamelet-steps/steps-pipe.yaml index ec9946f3a4..4272be693c 100644 --- a/e2e/yaks/common/kamelet-steps/steps-binding.yaml +++ b/e2e/yaks/common/kamelet-steps/steps-pipe.yaml @@ -15,10 +15,10 @@ # limitations under the License. # --------------------------------------------------------------------------- -apiVersion: camel.apache.org/v1alpha1 -kind: KameletBinding +apiVersion: camel.apache.org/v1 +kind: Pipe metadata: - name: steps-binding + name: steps-pipe spec: source: ref: diff --git a/e2e/yaks/common/kamelet-steps/yaks-config.yaml b/e2e/yaks/common/kamelet-steps/yaks-config.yaml index 080ecc1613..fd7157f7b1 100644 --- a/e2e/yaks/common/kamelet-steps/yaks-config.yaml +++ b/e2e/yaks/common/kamelet-steps/yaks-config.yaml @@ -23,8 +23,8 @@ pre: run: | kubectl apply -f timer-source.kamelet.yaml -n $YAKS_NAMESPACE kubectl apply -f prefix-action.kamelet.yaml -n $YAKS_NAMESPACE - kubectl apply -f steps-binding.yaml -n $YAKS_NAMESPACE - kubectl wait kameletbinding steps-binding --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE + kubectl apply -f steps-pipe.yaml -n $YAKS_NAMESPACE + kubectl wait pipe steps-pipe --for=condition=Ready --timeout=10m -n $YAKS_NAMESPACE post: - name: print dump if: env:CI=true && failure() diff --git a/e2e/yaks/common/kamelet/yaks-config.yaml b/e2e/yaks/common/kamelet/yaks-config.yaml index 44ee3ee6a2..7c14dc40ab 100644 --- a/e2e/yaks/common/kamelet/yaks-config.yaml +++ b/e2e/yaks/common/kamelet/yaks-config.yaml @@ -15,10 +15,6 @@ # limitations under the License. # --------------------------------------------------------------------------- -# Run integration test: -# -# yaks run -v ./e2e/yaks/common/kamelet/kamelet.feature - config: namespace: temporary: true diff --git a/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml b/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml index 538aa6019e..602bf9e38f 100644 --- a/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml +++ b/e2e/yaks/common/knative-sinkbinding/yaks-config.yaml @@ -15,10 +15,6 @@ # limitations under the License. # --------------------------------------------------------------------------- -# Run integration test: -# -# yaks run -v ./e2e/yaks/common/knative-sinkbinding/sinkbinding.feature - config: namespace: temporary: true