From c23ea9e98f0611d86cc9d92a37173e2ea6686e2b Mon Sep 17 00:00:00 2001 From: Matthias Wessendorf Date: Wed, 2 Oct 2024 14:09:57 +0200 Subject: [PATCH] Update data plane to serve webserver on context, not - as this is uncommon in Knative lands Signed-off-by: Matthias Wessendorf --- README.adoc | 1 - aws-s3-sink/README.adoc | 1 - aws-s3-sink/src/main/kubernetes/kubernetes.yml | 1 - aws-s3-sink/src/main/resources/knative.json | 2 +- aws-sqs-sink/README.adoc | 1 - aws-sqs-sink/src/main/kubernetes/kubernetes.yml | 1 - aws-sqs-sink/src/main/resources/knative.json | 2 +- log-sink/README.adoc | 1 - log-sink/src/main/kubernetes/kubernetes.yml | 1 - log-sink/src/main/resources/knative.json | 2 +- .../test/java/dev/knative/eventing/connector/LogSinkTest.java | 2 +- .../src/main/resources/archetype-resources/README.adoc | 1 - .../archetype-resources/src/main/kubernetes/kubernetes.yml | 1 - .../archetype-resources/src/main/resources/knative.json | 2 +- 14 files changed, 5 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index 9544b50..a7ecf95 100644 --- a/README.adoc +++ b/README.adoc @@ -364,7 +364,6 @@ spec: apiVersion: v1 kind: Service name: kn-connector-log-sink - uri: /events ---- The trigger for example filters the events by its type `ce-type=dev.knative.connector.event.timer`. diff --git a/aws-s3-sink/README.adoc b/aws-s3-sink/README.adoc index 59f7196..6852937 100644 --- a/aws-s3-sink/README.adoc +++ b/aws-s3-sink/README.adoc @@ -83,7 +83,6 @@ spec: apiVersion: v1 kind: Service name: kn-connector-aws-s3-sink - uri: /events ---- == Configuration diff --git a/aws-s3-sink/src/main/kubernetes/kubernetes.yml b/aws-s3-sink/src/main/kubernetes/kubernetes.yml index eeacbf4..c82c47e 100644 --- a/aws-s3-sink/src/main/kubernetes/kubernetes.yml +++ b/aws-s3-sink/src/main/kubernetes/kubernetes.yml @@ -14,4 +14,3 @@ spec: apiVersion: v1 kind: Service name: kn-connector-aws-s3-sink - uri: /events diff --git a/aws-s3-sink/src/main/resources/knative.json b/aws-s3-sink/src/main/resources/knative.json index c5d3081..aa44d5f 100644 --- a/aws-s3-sink/src/main/resources/knative.json +++ b/aws-s3-sink/src/main/resources/knative.json @@ -4,7 +4,7 @@ "name": "default", "type": "event", "endpointKind": "source", - "path": "/events", + "path": "/", "objectApiVersion": "eventing.knative.dev/v1", "objectKind": "Broker", "objectName": "default", diff --git a/aws-sqs-sink/README.adoc b/aws-sqs-sink/README.adoc index 5746334..f62860b 100644 --- a/aws-sqs-sink/README.adoc +++ b/aws-sqs-sink/README.adoc @@ -83,7 +83,6 @@ spec: apiVersion: v1 kind: Service name: kn-connector-aws-sqs-sink - uri: /events ---- == Configuration diff --git a/aws-sqs-sink/src/main/kubernetes/kubernetes.yml b/aws-sqs-sink/src/main/kubernetes/kubernetes.yml index 7188591..9ac7d29 100644 --- a/aws-sqs-sink/src/main/kubernetes/kubernetes.yml +++ b/aws-sqs-sink/src/main/kubernetes/kubernetes.yml @@ -14,4 +14,3 @@ spec: apiVersion: v1 kind: Service name: kn-connector-aws-sqs-sink - uri: /events diff --git a/aws-sqs-sink/src/main/resources/knative.json b/aws-sqs-sink/src/main/resources/knative.json index c5d3081..aa44d5f 100644 --- a/aws-sqs-sink/src/main/resources/knative.json +++ b/aws-sqs-sink/src/main/resources/knative.json @@ -4,7 +4,7 @@ "name": "default", "type": "event", "endpointKind": "source", - "path": "/events", + "path": "/", "objectApiVersion": "eventing.knative.dev/v1", "objectKind": "Broker", "objectName": "default", diff --git a/log-sink/README.adoc b/log-sink/README.adoc index 1edaec3..56320c0 100644 --- a/log-sink/README.adoc +++ b/log-sink/README.adoc @@ -83,7 +83,6 @@ spec: apiVersion: v1 kind: Service name: kn-connector-log-sink - uri: /events ---- == Configuration diff --git a/log-sink/src/main/kubernetes/kubernetes.yml b/log-sink/src/main/kubernetes/kubernetes.yml index 57913de..4668061 100644 --- a/log-sink/src/main/kubernetes/kubernetes.yml +++ b/log-sink/src/main/kubernetes/kubernetes.yml @@ -14,4 +14,3 @@ spec: apiVersion: v1 kind: Service name: kn-connector-log-sink - uri: /events diff --git a/log-sink/src/main/resources/knative.json b/log-sink/src/main/resources/knative.json index c5d3081..aa44d5f 100644 --- a/log-sink/src/main/resources/knative.json +++ b/log-sink/src/main/resources/knative.json @@ -4,7 +4,7 @@ "name": "default", "type": "event", "endpointKind": "source", - "path": "/events", + "path": "/", "objectApiVersion": "eventing.knative.dev/v1", "objectKind": "Broker", "objectName": "default", diff --git a/log-sink/src/test/java/dev/knative/eventing/connector/LogSinkTest.java b/log-sink/src/test/java/dev/knative/eventing/connector/LogSinkTest.java index 6205f51..9df9700 100644 --- a/log-sink/src/test/java/dev/knative/eventing/connector/LogSinkTest.java +++ b/log-sink/src/test/java/dev/knative/eventing/connector/LogSinkTest.java @@ -46,7 +46,7 @@ public void shouldConsumeEvents() { tc.when( http().client(knativeTrigger) .send() - .post("/events") + .post("/") .message() .body("Timer source event!") .header("ce-id", "@matches([0-9A-Z]{15}-[0-9]{16})@") diff --git a/tools/archetype-sink/src/main/resources/archetype-resources/README.adoc b/tools/archetype-sink/src/main/resources/archetype-resources/README.adoc index 5efe069..371e10d 100644 --- a/tools/archetype-sink/src/main/resources/archetype-resources/README.adoc +++ b/tools/archetype-sink/src/main/resources/archetype-resources/README.adoc @@ -83,7 +83,6 @@ spec: apiVersion: v1 kind: Service name: kn-connector-${kamelet-name}-sink - uri: /events ---- == Configuration diff --git a/tools/archetype-sink/src/main/resources/archetype-resources/src/main/kubernetes/kubernetes.yml b/tools/archetype-sink/src/main/resources/archetype-resources/src/main/kubernetes/kubernetes.yml index 8fed33a..bf7a25a 100644 --- a/tools/archetype-sink/src/main/resources/archetype-resources/src/main/kubernetes/kubernetes.yml +++ b/tools/archetype-sink/src/main/resources/archetype-resources/src/main/kubernetes/kubernetes.yml @@ -14,4 +14,3 @@ spec: apiVersion: v1 kind: Service name: kn-connector-${kamelet-name}-sink - uri: /events diff --git a/tools/archetype-sink/src/main/resources/archetype-resources/src/main/resources/knative.json b/tools/archetype-sink/src/main/resources/archetype-resources/src/main/resources/knative.json index c5d3081..aa44d5f 100644 --- a/tools/archetype-sink/src/main/resources/archetype-resources/src/main/resources/knative.json +++ b/tools/archetype-sink/src/main/resources/archetype-resources/src/main/resources/knative.json @@ -4,7 +4,7 @@ "name": "default", "type": "event", "endpointKind": "source", - "path": "/events", + "path": "/", "objectApiVersion": "eventing.knative.dev/v1", "objectKind": "Broker", "objectName": "default",