diff --git a/docs/eventing/samples/container-source/README.md b/docs/eventing/samples/container-source/README.md index ba12e55b0..95115f94d 100644 --- a/docs/eventing/samples/container-source/README.md +++ b/docs/eventing/samples/container-source/README.md @@ -125,22 +125,19 @@ You should see log lines showing the request headers and body of the event message sent by the heartbeats source to the display function: ``` -☁️ CloudEvent: valid ✅ +☁️ cloudevents.Event +Validation: valid Context Attributes, - SpecVersion: 0.2 - Type: dev.knative.eventing.samples.heartbeat - Source: https://github.com/knative/eventing-contrib/cmd/heartbeats/#event-test/mypod - ID: cd1f5f24-12dd-489d-aff4-23302c6091fa - Time: 2019-04-04T08:38:24.833521851Z - ContentType: application/json - Extensions: - beats: true - heart: yes - the: 42 -Transport Context, - URI: / - Host: event-display.default.svc.cluster.local - Method: POST + specversion: 0.3 + type: dev.knative.eventing.samples.heartbeat + source: https://knative.dev/eventing-contrib/cmd/heartbeats/#event-test/mypod + id: 2b72d7bf-c38f-4a98-a433-608fbcdd2596 + time: 2019-10-18T15:23:20.809775386Z + contenttype: application/json +Extensions, + beats: true + heart: yes + the: 42 Data, { "id": 2, diff --git a/docs/eventing/samples/container-source/heartbeats-source.yaml b/docs/eventing/samples/container-source/heartbeats-source.yaml index ab3fe7716..1897c2215 100644 --- a/docs/eventing/samples/container-source/heartbeats-source.yaml +++ b/docs/eventing/samples/container-source/heartbeats-source.yaml @@ -8,7 +8,7 @@ spec: containers: # This corresponds to a heartbeats image uri you build and publish, # e.g. gcr.io/[gcloud-project]/github.com/knative/eventing-contrib/cmd/heartbeats - - image: github.com/knative/eventing-contrib/cmd/heartbeats + - image: knative.dev/eventing-contrib/cmd/heartbeats name: heartbeats args: - --period=1 @@ -18,6 +18,6 @@ spec: - name: POD_NAMESPACE value: "event-test" sink: - apiVersion: serving.knative.dev/v1 + apiVersion: serving.knative.dev/v1alpha1 kind: Service name: event-display diff --git a/docs/eventing/samples/cronjob-source/README.md b/docs/eventing/samples/cronjob-source/README.md index 9ffd43b8e..001a9f076 100644 --- a/docs/eventing/samples/cronjob-source/README.md +++ b/docs/eventing/samples/cronjob-source/README.md @@ -77,18 +77,16 @@ kubectl logs -l serving.knative.dev/service=event-display -c user-container --si You should see log lines showing the request headers and body from the source: ``` -2019/03/14 14:28:06 Message Dumper received a message: POST / HTTP/1.1 -Host: event-display.default.svc.cluster.local -Transfer-Encoding: chunked -Accept-Encoding: gzip -Ce-Cloudeventsversion: 0.1 -Ce-Eventid: 9790bf44-914a-4e66-af59-b43c06ccb73b -Ce-Eventtime: 2019-03-14T14:28:00.005163309Z -Ce-Eventtype: dev.knative.cronjob.event -Ce-Source: CronJob -... - -{"message":"Hello world!"} +☁️ cloudevents.Event +Validation: valid +Context Attributes, + specversion: 0.3 + type: dev.knative.cronjob.event + source: /apis/v1/namespaces/default/cronjobsources/test-cronjob-source + id: 7f88a38f-35f1-41f6-b72d-6b1af1d64e6e + time: 2019-10-18T15:18:00.000829514Z +Data, + {"message":"Hello world!"} ``` You can also use [`kail`](https://github.com/boz/kail) instead of `kubectl logs` diff --git a/docs/eventing/samples/github-source/README.md b/docs/eventing/samples/github-source/README.md index 325d7aa5b..ebe6a8ae5 100644 --- a/docs/eventing/samples/github-source/README.md +++ b/docs/eventing/samples/github-source/README.md @@ -41,7 +41,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 ``` Enter the following command to create the service from `service.yaml`: @@ -126,7 +126,7 @@ spec: sink: apiVersion: serving.knative.dev/v1 kind: Service - name: github-event-display + name: github-message-dumper ``` Then, apply that yaml using `kubectl`: diff --git a/docs/eventing/samples/kafka/source/README.md b/docs/eventing/samples/kafka/source/README.md index e28cca01a..5e4471314 100644 --- a/docs/eventing/samples/kafka/source/README.md +++ b/docs/eventing/samples/kafka/source/README.md @@ -47,7 +47,7 @@ You must ensure that you meet the [prerequisites listed in the Apache Kafka over - Replicas ```yaml - apiVersion: kafka.strimzi.io/v1alpha1 + apiVersion: kafka.strimzi.io/v1beta1 kind: KafkaTopic metadata: name: knative-demo-topic @@ -109,7 +109,7 @@ You must ensure that you meet the [prerequisites listed in the Apache Kafka over bootstrapServers: my-cluster-kafka-bootstrap.kafka:9092 #note the kafka namespace topics: knative-demo-topic sink: - apiVersion: serving.knative.dev/v1alpha1 + apiVersion: serving.knative.dev/v1 kind: Service name: event-display ``` @@ -158,24 +158,21 @@ You must ensure that you meet the [prerequisites listed in the Apache Kafka over ``` $ kubectl logs --selector='serving.knative.dev/service=event-display' -c user-container - ☁️ CloudEvent: valid ✅ - Context Attributes, - SpecVersion: 0.2 - Type: dev.knative.kafka.event - Source: dubee - ID: partition:0/offset:333 - Time: 2019-03-19T22:32:06.535321588Z - ContentType: application/json - Extensions: - key: - Transport Context, - URI: / - Host: event-display.default.svc.cluster.local - Method: POST - Data, - { - "msg": "This is a test!" - } + ☁️ cloudevents.Event + Validation: valid + Context Attributes, + specversion: 0.3 + type: dev.knative.kafka.event + source: dubee + id: partition:0/offset:333 + time: 2019-10-18T15:23:20.809775386Z + contenttype: application/json + Extensions, + key: + Data, + { + "msg": "This is a test!" + } ``` ## Teardown Steps diff --git a/docs/eventing/samples/kafka/source/event-source.yaml b/docs/eventing/samples/kafka/source/event-source.yaml index 25ef6890a..2331cdd04 100644 --- a/docs/eventing/samples/kafka/source/event-source.yaml +++ b/docs/eventing/samples/kafka/source/event-source.yaml @@ -70,6 +70,6 @@ spec: cpu: 250m memory: 512Mi sink: - apiVersion: serving.knative.dev/v1alpha1 + apiVersion: serving.knative.dev/v1 kind: Service name: event-display diff --git a/docs/eventing/samples/kafka/source/kafka-topic.yaml b/docs/eventing/samples/kafka/source/kafka-topic.yaml index 1e8c61159..b7826a6ab 100644 --- a/docs/eventing/samples/kafka/source/kafka-topic.yaml +++ b/docs/eventing/samples/kafka/source/kafka-topic.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: kafka.strimzi.io/v1alpha1 +apiVersion: kafka.strimzi.io/v1beta1 kind: KafkaTopic metadata: name: knative-demo-topic diff --git a/docs/eventing/samples/kubernetes-event-source/README.md b/docs/eventing/samples/kubernetes-event-source/README.md index c1013117d..f6924601b 100644 --- a/docs/eventing/samples/kubernetes-event-source/README.md +++ b/docs/eventing/samples/kubernetes-event-source/README.md @@ -189,21 +189,15 @@ kubectl logs -l serving.knative.dev/service=event-display -c user-container You should see log lines similar to: ``` -☁️ CloudEvent: valid ✅ +☁️ cloudevents.Event +Validation: valid Context Attributes, - SpecVersion: 0.2 - Type: dev.knative.apiserver.resource.add - Source: https://10.39.240.1:443 - ID: 716d4536-3b92-4fbb-98d9-14bfcf94683f - Time: 2019-05-10T23:27:06.695575294Z - ContentType: application/json - Extensions: - knativehistory: default-broker-b7k2p-channel-z7mqq.default.svc.cluster.local - subject: /apis/v1/namespaces/default/events/busybox.159d7608e3a3572c -Transport Context, - URI: / - Host: auto-event-display.default.svc.cluster.local - Method: POST + specversion: 0.3 + type: dev.knative.apiserver.resource.add + source: https://10.96.0.1:443 + subject: /apis/v1/namespaces/default/events/busybox.15cec7980c1702d1 + id: 6ea84c37-c2b4-4687-866b-fb1b2c0fe969 + time: 2019-10-18T15:32:55.855413776Z Data, { "apiVersion": "v1", diff --git a/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml b/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml index 4990b23ee..a32d18c03 100644 --- a/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml +++ b/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml @@ -10,6 +10,6 @@ spec: - apiVersion: v1 kind: Event sink: - apiVersion: eventing.knative.dev/v1alpha1 - kind: Broker - name: default + apiVersion: serving.knative.dev/v1alpha1 + kind: Service + name: event-display