diff --git a/docs/eventing/samples/parallel/README.md b/docs/eventing/samples/parallel/README.md index bf7104124..40f12dcd9 100644 --- a/docs/eventing/samples/parallel/README.md +++ b/docs/eventing/samples/parallel/README.md @@ -15,7 +15,7 @@ All examples are using the ## Examples For each of these examples below, we'll use -[`CronJobSource`](../cronjob-source/README.md) as the source of events. +[`PingSource`](../ping-source/README.md) as the source of events. We also use simple [functions](https://github.com/lionelvillard/knative-functions) to perform diff --git a/docs/eventing/samples/parallel/multiple-branches/README.md b/docs/eventing/samples/parallel/multiple-branches/README.md index 98aa9e933..00f393065 100644 --- a/docs/eventing/samples/parallel/multiple-branches/README.md +++ b/docs/eventing/samples/parallel/multiple-branches/README.md @@ -89,7 +89,7 @@ spec: template: spec: containers: - - image: gcr.io/knative-releases/github.com/knative/eventing-sources/cmd/event_display + - image: gcr.io/knative-releases/knative.dev/eventing-contrib/cmd/event_display ``` Change `default` below to create the `Sequence` in the Namespace where you want @@ -104,13 +104,13 @@ kubectl -n default create -f ./event-display.yaml The `parallel.yaml` file contains the specifications for creating the Parallel. ```yaml -apiVersion: flows.knative.dev/v1alpha1 +apiVersion: flows.knative.dev/v1beta1 kind: Parallel metadata: name: odd-even-parallel spec: channelTemplate: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel branches: - filter: @@ -144,34 +144,34 @@ spec: kubectl create -f ./parallel.yaml ``` -### Create the CronJobSource targeting the Parallel +### Create the PingSource targeting the Parallel -This will create a CronJobSource which will send a CloudEvent with {"message": -"Even or odd?"} as the data payload every minute. +This will create a PingSource which will send a CloudEvent with `{"message": +"Even or odd?"}` as the data payload every minute. ```yaml -apiVersion: sources.eventing.knative.dev/v1alpha1 -kind: CronJobSource +apiVersion: sources.knative.dev/v1alpha2 +kind: PingSource metadata: - name: cronjob-source + name: ping-source spec: schedule: "*/1 * * * *" data: '{"message": "Even or odd?"}' sink: ref: - apiVersion: flows.knative.dev/v1alpha1 + apiVersion: flows.knative.dev/v1alpha2 kind: Parallel name: odd-even-parallel ``` ```shell -kubectl create -f ./cron-source.yaml +kubectl create -f ./ping-source.yaml ``` ### Inspecting the results You can now see the final output by inspecting the logs of the event-display -pods. Note that since we set the `CronJobSource` to emit every minute, it might +pods. Note that since we set the `PingSource` to emit every minute, it might take some time for the events to show up in the logs. Let's look at the `event-display` log: @@ -182,14 +182,15 @@ kubectl logs -l serving.knative.dev/service=event-display --tail=30 -c user-cont ☁️ cloudevents.Event Validation: valid Context Attributes, - specversion: 0.3 - type: dev.knative.cronjob.event - source: /apis/v1/namespaces/default/cronjobsources/cronjob-source - id: 2884f4a3-53f2-4926-a32c-e696a6fb3697 - time: 2019-07-31T18:10:00.000309586Z + specversion: 1.0 + type: dev.knative.sources.ping + source: /apis/v1/namespaces/default/pingsources/ping-source + id: 015a4cf4-8a43-44a9-8702-3d4171d27ba5 + time: 2020-03-03T21:24:00.0007254Z datacontenttype: application/json; charset=utf-8 Extensions, - knativehistory: odd-even-parallel-kn-parallel-0-kn-channel.default.svc.cluster.local, odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local + knativehistory: odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local; odd-even-parallel-kn-parallel-0-kn-channel.default.svc.cluster.local + traceparent: 00-41a139bf073f3cfcba7bb7ce7f1488fc-68a891ace985221a-00 Data, { "message": "we are even!" @@ -197,14 +198,15 @@ Data, ☁️ cloudevents.Event Validation: valid Context Attributes, - specversion: 0.3 - type: dev.knative.cronjob.event - source: /apis/v1/namespaces/default/cronjobsources/cronjob-source - id: 2e519f11-3b6f-401c-b196-73f8b235de58 - time: 2019-07-31T18:11:00.002649881Z + specversion: 1.0 + type: dev.knative.sources.ping + source: /apis/v1/namespaces/default/pingsources/ping-source + id: 52e6b097-f914-4b5a-8539-165650e85bcd + time: 2020-03-03T21:23:00.0004662Z datacontenttype: application/json; charset=utf-8 Extensions, - knativehistory: odd-even-parallel-kn-parallel-1-kn-channel.default.svc.cluster.local, odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local + knativehistory: odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local; odd-even-parallel-kn-parallel-1-kn-channel.default.svc.cluster.local + traceparent: 00-58d371410d7daf2033be226860b4ee5d-05d686ee90c3226f-00 Data, { "message": "this is odd!" diff --git a/docs/eventing/samples/parallel/multiple-branches/cron-source.yaml b/docs/eventing/samples/parallel/multiple-branches/cron-source.yaml deleted file mode 100644 index 082044547..000000000 --- a/docs/eventing/samples/parallel/multiple-branches/cron-source.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: sources.eventing.knative.dev/v1alpha1 -kind: CronJobSource -metadata: - name: cronjob-source -spec: - schedule: "*/1 * * * *" - data: '{"message": "Even or odd?"}' - sink: - ref: - apiVersion: flows.knative.dev/v1alpha1 - kind: Parallel - name: odd-even-parallel diff --git a/docs/eventing/samples/parallel/multiple-branches/event-display.yaml b/docs/eventing/samples/parallel/multiple-branches/event-display.yaml index a24926f19..63d234e98 100644 --- a/docs/eventing/samples/parallel/multiple-branches/event-display.yaml +++ b/docs/eventing/samples/parallel/multiple-branches/event-display.yaml @@ -6,4 +6,4 @@ spec: template: spec: containers: - - image: gcr.io/knative-releases/github.com/knative/eventing-sources/cmd/event_display + - image: gcr.io/knative-releases/knative.dev/eventing-contrib/cmd/event_display diff --git a/docs/eventing/samples/parallel/multiple-branches/parallel.yaml b/docs/eventing/samples/parallel/multiple-branches/parallel.yaml index 9b68162ea..7c93f2c96 100644 --- a/docs/eventing/samples/parallel/multiple-branches/parallel.yaml +++ b/docs/eventing/samples/parallel/multiple-branches/parallel.yaml @@ -1,10 +1,10 @@ -apiVersion: flows.knative.dev/v1alpha1 +apiVersion: flows.knative.dev/v1beta1 kind: Parallel metadata: name: odd-even-parallel spec: channelTemplate: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel branches: - filter: diff --git a/docs/eventing/samples/parallel/multiple-branches/ping-source.yaml b/docs/eventing/samples/parallel/multiple-branches/ping-source.yaml new file mode 100644 index 000000000..e4535b5f7 --- /dev/null +++ b/docs/eventing/samples/parallel/multiple-branches/ping-source.yaml @@ -0,0 +1,12 @@ +apiVersion: sources.knative.dev/v1alpha2 +kind: PingSource +metadata: + name: ping-source +spec: + schedule: "*/1 * * * *" + jsonData: '{"message": "Even or odd?"}' + sink: + ref: + apiVersion: flows.knative.dev/v1beta1 + kind: Parallel + name: odd-even-parallel diff --git a/docs/eventing/samples/parallel/mutual-exclusivity/README.md b/docs/eventing/samples/parallel/mutual-exclusivity/README.md index 9e8ecd69b..b64973279 100644 --- a/docs/eventing/samples/parallel/mutual-exclusivity/README.md +++ b/docs/eventing/samples/parallel/mutual-exclusivity/README.md @@ -69,7 +69,7 @@ spec: kubectl create -f ./switcher.yaml -f ./transformers.yaml ``` -### Create the Service displaying the events created by Sequence +### Create the Service displaying the events created by Parallel ```yaml apiVersion: serving.knative.dev/v1 @@ -80,12 +80,9 @@ spec: template: spec: containers: - - image: gcr.io/knative-releases/github.com/knative/eventing-sources/cmd/event_display + - image: gcr.io/knative-releases/knative.dev/eventing-contrib/cmd/event_display ``` -Change `default` below to create the `Sequence` in the Namespace where you want -your resources to be created. - ```shell kubectl -n default create -f ./event-display.yaml ``` @@ -95,13 +92,13 @@ kubectl -n default create -f ./event-display.yaml The `parallel.yaml` file contains the specifications for creating the Parallel object. ```yaml -apiVersion: flows.knative.dev/v1alpha1 +apiVersion: flows.knative.dev/v1beta1 kind: Parallel metadata: name: me-odd-even-parallel spec: channelTemplate: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel branches: - filter: @@ -129,52 +126,53 @@ spec: kubectl create -f ./parallel.yaml ``` -### Create the CronJobSource targeting the Parallel object +### Create the PingSource targeting the Parallel object -This will create a CronJobSource which will send a CloudEvent with {"message": -"Even or odd?"} as the data payload every minute. +This will create a PingSource which will send a CloudEvent with `{"message": +"Even or odd?"}` as the data payload every minute. ```yaml -apiVersion: sources.eventing.knative.dev/v1alpha1 -kind: CronJobSource +apiVersion: sources.knative.dev/v1alpha2 +kind: PingSource metadata: - name: me-cronjob-source + name: me-ping-source spec: schedule: "*/1 * * * *" - data: '{"message": "Even or odd?"}' + jsonData: '{"message": "Even or odd?"}' sink: ref: - apiVersion: flows.knative.dev/v1alpha1 + apiVersion: flows.knative.dev/v1beta1 kind: Parallel name: me-odd-even-parallel ``` ```shell -kubectl create -f ./cron-source.yaml +kubectl create -f ./ping-source.yaml ``` ### Inspecting the results You can now see the final output by inspecting the logs of the -`me-event-display` pods. Note that since we set the `CronJobSource` to emit +`me-event-display` pods. Note that since we set the `PingSource` to emit every minute, it might take some time for the events to show up in the logs. Let's look at the `me-event-display` log: ```shell -kubectl logs -l serving.knative.dev/service=me-event-display --tail=30 -c user-container +kubectl logs -l serving.knative.dev/service=me-event-display --tail=50 -c user-container ☁️ cloudevents.Event Validation: valid Context Attributes, - specversion: 0.3 - type: dev.knative.cronjob.event - source: /apis/v1/namespaces/default/cronjobsources/me-cronjob-source - id: 48eea348-8cfd-4aba-9ead-cb024ce16a48 - time: 2019-07-31T20:56:00.000477587Z + specversion: 1.0 + type: dev.knative.sources.ping + source: /apis/v1/namespaces/default/pingsources/me-ping-source + id: 0b0db15c-9b36-4388-8eaa-8c23a9dc2707 + time: 2020-03-03T21:30:00.0007292Z datacontenttype: application/json; charset=utf-8 Extensions, - knativehistory: me-odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local, me-odd-even-parallel-kn-parallel-0-kn-channel.default.svc.cluster.local + knativehistory: me-odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local; me-odd-even-parallel-kn-parallel-0-kn-channel.default.svc.cluster.local + traceparent: 00-e8b17109cd21d4fa66a86633b5a614c7-ba96d220fe13211c-00 Data, { "message": "we are even!" @@ -182,14 +180,15 @@ Data, ☁️ cloudevents.Event Validation: valid Context Attributes, - specversion: 0.3 - type: dev.knative.cronjob.event - source: /apis/v1/namespaces/default/cronjobsources/me-cronjob-source - id: 42717dcf-b194-4b36-a094-3ea20e565ad5 - time: 2019-07-31T20:57:00.000312243Z + specversion: 1.0 + type: dev.knative.sources.ping + source: /apis/v1/namespaces/default/pingsources/me-ping-source + id: 321170d1-dea7-4b18-9290-28adb1de089b + time: 2020-03-03T21:31:00.0007847Z datacontenttype: application/json; charset=utf-8 Extensions, - knativehistory: me-odd-even-parallel-kn-parallel-1-kn-channel.default.svc.cluster.local, me-odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local + knativehistory: me-odd-even-parallel-kn-parallel-kn-channel.default.svc.cluster.local; me-odd-even-parallel-kn-parallel-1-kn-channel.default.svc.cluster.local + traceparent: 00-78d8b044d23c85789f0a13fd3679ac24-1d69ddde56d620c7-00 Data, { "message": "this is odd!" diff --git a/docs/eventing/samples/parallel/mutual-exclusivity/cron-source.yaml b/docs/eventing/samples/parallel/mutual-exclusivity/cron-source.yaml deleted file mode 100644 index 7503b1384..000000000 --- a/docs/eventing/samples/parallel/mutual-exclusivity/cron-source.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: sources.eventing.knative.dev/v1alpha1 -kind: CronJobSource -metadata: - name: me-cronjob-source -spec: - schedule: "*/1 * * * *" - data: '{"message": "Even or odd?"}' - sink: - ref: - apiVersion: flows.knative.dev/v1alpha1 - kind: Parallel - name: me-odd-even-parallel diff --git a/docs/eventing/samples/parallel/mutual-exclusivity/event-display.yaml b/docs/eventing/samples/parallel/mutual-exclusivity/event-display.yaml index 5e96707a9..0820e2b7e 100644 --- a/docs/eventing/samples/parallel/mutual-exclusivity/event-display.yaml +++ b/docs/eventing/samples/parallel/mutual-exclusivity/event-display.yaml @@ -6,4 +6,4 @@ spec: template: spec: containers: - - image: gcr.io/knative-releases/github.com/knative/eventing-sources/cmd/event_display + - image: gcr.io/knative-releases/knative.dev/eventing-contrib/cmd/event_display diff --git a/docs/eventing/samples/parallel/mutual-exclusivity/parallel.yaml b/docs/eventing/samples/parallel/mutual-exclusivity/parallel.yaml index 1078dd6b9..f0842c5d8 100644 --- a/docs/eventing/samples/parallel/mutual-exclusivity/parallel.yaml +++ b/docs/eventing/samples/parallel/mutual-exclusivity/parallel.yaml @@ -1,10 +1,10 @@ -apiVersion: flows.knative.dev/v1alpha1 +apiVersion: flows.knative.dev/v1beta1 kind: Parallel metadata: name: me-odd-even-parallel spec: channelTemplate: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel branches: - filter: diff --git a/docs/eventing/samples/parallel/mutual-exclusivity/ping-source.yaml b/docs/eventing/samples/parallel/mutual-exclusivity/ping-source.yaml new file mode 100644 index 000000000..aa6f028d7 --- /dev/null +++ b/docs/eventing/samples/parallel/mutual-exclusivity/ping-source.yaml @@ -0,0 +1,12 @@ +apiVersion: sources.knative.dev/v1alpha2 +kind: PingSource +metadata: + name: me-ping-source +spec: + schedule: "*/1 * * * *" + jsonData: '{"message": "Even or odd?"}' + sink: + ref: + apiVersion: flows.knative.dev/v1beta1 + kind: Parallel + name: me-odd-even-parallel