From 8dcca2764db60006bf256fb98f5ba32783b80ec5 Mon Sep 17 00:00:00 2001 From: Ville Aikas <11279988+vaikas@users.noreply.github.com> Date: Tue, 9 Jun 2020 15:47:39 -0700 Subject: [PATCH] v1alpha1 -> v1beta1 (#2561) * v1alpha1 -> v1beta1 * fix links, cronjobsource->pingsource --- docs/eventing/README.md | 6 +++--- docs/eventing/broker/README.md | 2 +- docs/eventing/debugging/README.md | 2 +- docs/eventing/debugging/example.yaml | 8 ++++---- docs/eventing/event-registry.md | 14 +++++++------- docs/eventing/flows/sequence.md | 12 ++++++------ .../apache-camel-source/display_resources.yaml | 6 +++--- .../apache-camel-source/source_http_poller.yaml | 2 +- .../samples/apache-camel-source/source_mqtt.yaml | 2 +- .../apache-camel-source/source_telegram.yaml | 2 +- .../samples/apache-camel-source/source_timer.yaml | 2 +- .../samples/helloworld/helloworld-go/README.md | 4 ++-- .../samples/iot-core/gcp-pubsub-source.yaml | 2 +- docs/eventing/samples/iot-core/trigger.yaml | 2 +- .../samples/kafka/channel/020-k8s-events.yaml | 2 +- .../samples/kafka/channel/030-trigger.yaml | 2 +- .../samples/kubernetes-event-source/README.md | 4 ++-- .../kubernetes-event-source/k8s-events.yaml | 2 +- .../samples/kubernetes-event-source/trigger.yaml | 2 +- .../sequence/sequence-reply-to-sequence/README.md | 2 +- .../sequence-with-broker-trigger/README.md | 2 +- 21 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/eventing/README.md b/docs/eventing/README.md index c42d15cb7..81abf58cc 100644 --- a/docs/eventing/README.md +++ b/docs/eventing/README.md @@ -113,11 +113,11 @@ the event destination. Knative Eventing also defines an event forwarding and persistence layer, called a -[**Channel**](https://github.com/knative/eventing/blob/master/pkg/apis/messaging/v1alpha1/channel_types.go#L57). +[**Channel**](https://github.com/knative/eventing/blob/master/pkg/apis/messaging/v1beta1/channel_types.go#L57). Each channel is a separate Kubernetes [Custom Resource](https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/). Events are delivered to Services or forwarded to other channels (possibly of a different type) using -[Subscriptions](https://github.com/knative/eventing/blob/master/pkg/apis/messaging/v1alpha1/subscription_types.go). +[Subscriptions](https://github.com/knative/eventing/blob/master/pkg/apis/messaging/v1beta1/subscription_types.go). This allows message delivery in a cluster to vary based on requirements, so that some events might be handled by an in-memory implementation while others would be persisted using Apache Kafka or NATS Streaming. @@ -165,7 +165,7 @@ If you need a Source not covered by the ones mentioned below nor by the other If your code needs to send events as part of its business logic and doesn't fit the model of a Source, consider -[feeding events directly to a Broker](https://knative.dev/docs/eventing/broker-trigger/#manual). +[feeding events directly to a Broker](https://knative.dev/docs/eventing/broker/). ### Core Sources diff --git a/docs/eventing/broker/README.md b/docs/eventing/broker/README.md index 4e9af3e78..afb85ee8c 100644 --- a/docs/eventing/broker/README.md +++ b/docs/eventing/broker/README.md @@ -253,7 +253,7 @@ spec: sink: ref: # Deliver events to Broker. - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default ``` diff --git a/docs/eventing/debugging/README.md b/docs/eventing/debugging/README.md index 50350bc12..fa5b1f766 100644 --- a/docs/eventing/debugging/README.md +++ b/docs/eventing/debugging/README.md @@ -186,7 +186,7 @@ kubectl --namespace knative-debug get apiserversource src -o jsonpath='{.spec.si ``` Which should return -`map[apiVersion:messaging.knative.dev/v1alpha1 kind:Channel name:chan]`. If it +`map[apiVersion:messaging.knative.dev/v1beta1 kind:Channel name:chan]`. If it doesn't, then `src` was setup incorrectly and its `spec` needs to be fixed. Fixing should be as simple as updating its `spec` to have the correct `sink` (see [example.yaml](example.yaml)). diff --git a/docs/eventing/debugging/example.yaml b/docs/eventing/debugging/example.yaml index 7bfd479f6..cc49c2624 100644 --- a/docs/eventing/debugging/example.yaml +++ b/docs/eventing/debugging/example.yaml @@ -24,7 +24,7 @@ spec: kind: Event sink: ref: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: chan @@ -32,7 +32,7 @@ spec: # The Channel events are sent to. -apiVersion: messaging.knative.dev/v1alpha1 +apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel metadata: name: chan @@ -41,14 +41,14 @@ metadata: # The Subscription to the InMemoryChannel. -apiVersion: messaging.knative.dev/v1alpha1 +apiVersion: messaging.knative.dev/v1beta1 kind: Subscription metadata: name: sub namespace: knative-debug spec: channel: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: chan subscriber: diff --git a/docs/eventing/event-registry.md b/docs/eventing/event-registry.md index b58cf9a08..d825ddf90 100644 --- a/docs/eventing/event-registry.md +++ b/docs/eventing/event-registry.md @@ -13,7 +13,7 @@ type's information in the cluster's data store. ## Before you begin -1. Read about the [Broker and Trigger objects](./broker-trigger.md). +1. Read about the [Broker and Trigger objects](./broker/). 1. Be familiar with the [CloudEvents spec](https://github.com/cloudevents/spec/blob/master/spec.md), particularly the @@ -55,7 +55,7 @@ looks like: Omitting irrelevant fields: ```yaml -apiVersion: eventing.knative.dev/v1alpha1 +apiVersion: eventing.knative.dev/v1beta1 kind: EventType metadata: name: dev.knative.source.github.push-34cnb @@ -120,7 +120,7 @@ Here are a few example Triggers that subscribe to events using exact matching on 1. Subscribes to GitHub _pushes_ from any source. ```yaml - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: push-trigger @@ -145,7 +145,7 @@ Here are a few example Triggers that subscribe to events using exact matching on 1. Subscribes to GitHub _pull requests_ from _knative's eventing_ repository. ```yaml - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: gh-knative-eventing-pull-trigger @@ -166,7 +166,7 @@ Here are a few example Triggers that subscribe to events using exact matching on 1. Subscribes to Kafka messages sent to the _knative-demo_ topic ```yaml - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: kafka-knative-demo-trigger @@ -188,7 +188,7 @@ Here are a few example Triggers that subscribe to events using exact matching on _testing_ topic ```yaml - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: gcp-pubsub-knative-testing-trigger @@ -251,7 +251,7 @@ the next topic: How do we actually populate the registry in the first place? bootstrapServers: my-cluster-kafka-bootstrap.kafka:9092 topics: knative-demo,news sink: - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default ``` diff --git a/docs/eventing/flows/sequence.md b/docs/eventing/flows/sequence.md index b21c57604..4c391c17c 100644 --- a/docs/eventing/flows/sequence.md +++ b/docs/eventing/flows/sequence.md @@ -18,7 +18,7 @@ Sequence has three parts for the Spec: 1. `Steps` which defines the in-order list of `Subscriber`s, aka, which functions are executed in the listed order. These are specified using the - `eventingv1alpha1.SubscriberSpec` just like you would when creating + `messaging.v1beta1.SubscriberSpec` just like you would when creating `Subscription`. Each step should be `Addressable`. 1. `ChannelTemplate` defines the Template which will be used to create `Channel`s between the steps. @@ -46,7 +46,7 @@ Sequence has four parts for the Status: ## Examples For each of these examples below, we'll use -[`CronJobSource`](https://knative.dev/docs/eventing/samples/cronjob-source/) as +[`PingSource`](https://knative.dev/docs/eventing/samples/ping-source/) as the source of events. We also use a very simple @@ -57,14 +57,14 @@ through each stage. ### [Sequence with no reply (terminal last Step)](../samples/sequence/sequence-terminal/README.md) For the first example, we'll use a 3 Step `Sequence` that is wired directly into -the `CronJobSource`. Each of the steps simply tacks on "- Handled by +the `PingSource`. Each of the steps simply tacks on "- Handled by ", for example the first Step in the `Sequence` will take the incoming message and append "- Handled by 0" to the incoming message. ### [Sequence with reply (last Step produces output)](../samples/sequence/sequence-reply-to-event-display/README.md) For the next example, we'll use the same 3 Step `Sequence` that is wired -directly into the `CronJobSource`. Each of the steps simply tacks on "- Handled +directly into the `PingSource`. Each of the steps simply tacks on "- Handled by ", for example the first Step in the `Sequence` will take the incoming message and append "- Handled by 0" to the incoming message. @@ -74,7 +74,7 @@ the output of the last Step to an event display pod. ### [Chaining Sequences together](../samples/sequence/sequence-reply-to-sequence/README.md) For the next example, we'll use the same 3 Step `Sequence` that is wired -directly into the `CronJobSource`. Each of the steps simply tacks on "- Handled +directly into the `PingSource`. Each of the steps simply tacks on "- Handled by ", for example the first Step in the `Sequence` will take the incoming message and append "- Handled by 0" to the incoming message. @@ -85,6 +85,6 @@ modifications as the first pipeline (with different steps however). ### [Using Sequence with Broker/Trigger model](../samples/sequence/sequence-with-broker-trigger/README.md) You can also create a Trigger which targets `Sequence`. This time we'll wire -`CronJobSource` to send events to a `Broker` and then we'll have the `Sequence` +`PingSource` to send events to a `Broker` and then we'll have the `Sequence` emit the resulting Events back into the Broker so that the results of the `Sequence` can be observed by other `Trigger`s. diff --git a/docs/eventing/samples/apache-camel-source/display_resources.yaml b/docs/eventing/samples/apache-camel-source/display_resources.yaml index ba07d352a..da144c7b5 100644 --- a/docs/eventing/samples/apache-camel-source/display_resources.yaml +++ b/docs/eventing/samples/apache-camel-source/display_resources.yaml @@ -1,6 +1,6 @@ # Channel for testing events. -apiVersion: messaging.knative.dev/v1alpha1 +apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel metadata: name: camel-test @@ -9,13 +9,13 @@ metadata: # Subscription from the CamelSource's output Channel to the Knative Service below. -apiVersion: messaging.knative.dev/v1alpha1 +apiVersion: messaging.knative.dev/v1beta1 kind: Subscription metadata: name: camel-source-display spec: channel: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: camel-test subscriber: diff --git a/docs/eventing/samples/apache-camel-source/source_http_poller.yaml b/docs/eventing/samples/apache-camel-source/source_http_poller.yaml index 5e41e2ec4..62e635431 100644 --- a/docs/eventing/samples/apache-camel-source/source_http_poller.yaml +++ b/docs/eventing/samples/apache-camel-source/source_http_poller.yaml @@ -21,6 +21,6 @@ spec: constant: application/json sink: ref: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: camel-test diff --git a/docs/eventing/samples/apache-camel-source/source_mqtt.yaml b/docs/eventing/samples/apache-camel-source/source_mqtt.yaml index d924efa4e..cdbfc7fad 100644 --- a/docs/eventing/samples/apache-camel-source/source_mqtt.yaml +++ b/docs/eventing/samples/apache-camel-source/source_mqtt.yaml @@ -27,6 +27,6 @@ spec: message: "Forwarding: ${body}" sink: ref: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: camel-test diff --git a/docs/eventing/samples/apache-camel-source/source_telegram.yaml b/docs/eventing/samples/apache-camel-source/source_telegram.yaml index 4016514da..a2d6ccaf5 100644 --- a/docs/eventing/samples/apache-camel-source/source_telegram.yaml +++ b/docs/eventing/samples/apache-camel-source/source_telegram.yaml @@ -30,6 +30,6 @@ spec: simple: "${body.text}" sink: ref: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: camel-test diff --git a/docs/eventing/samples/apache-camel-source/source_timer.yaml b/docs/eventing/samples/apache-camel-source/source_timer.yaml index 89c4705df..fc1011313 100644 --- a/docs/eventing/samples/apache-camel-source/source_timer.yaml +++ b/docs/eventing/samples/apache-camel-source/source_timer.yaml @@ -23,6 +23,6 @@ spec: constant: Hello world! sink: ref: - apiVersion: messaging.knative.dev/v1alpha1 + apiVersion: messaging.knative.dev/v1beta1 kind: InMemoryChannel name: camel-test diff --git a/docs/eventing/samples/helloworld/helloworld-go/README.md b/docs/eventing/samples/helloworld/helloworld-go/README.md index b17ec3639..88fc32367 100644 --- a/docs/eventing/samples/helloworld/helloworld-go/README.md +++ b/docs/eventing/samples/helloworld/helloworld-go/README.md @@ -181,7 +181,7 @@ cd knative-docs/docs/eventing/samples/helloworld/helloworld-go targetPort: 8080 --- # Knative Eventing Trigger to trigger the helloworld-go service - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: helloworld-go @@ -379,7 +379,7 @@ mesh via the Broker and can be delivered to other services using a Trigger ```shell kubectl --namespace knative-samples apply --filename - << END - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: event-display diff --git a/docs/eventing/samples/iot-core/gcp-pubsub-source.yaml b/docs/eventing/samples/iot-core/gcp-pubsub-source.yaml index 7d16f196d..c2ca1ddac 100644 --- a/docs/eventing/samples/iot-core/gcp-pubsub-source.yaml +++ b/docs/eventing/samples/iot-core/gcp-pubsub-source.yaml @@ -13,6 +13,6 @@ spec: googleCloudProject: PROJECT_ID topic: TOPIC_NAME sink: - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default diff --git a/docs/eventing/samples/iot-core/trigger.yaml b/docs/eventing/samples/iot-core/trigger.yaml index 34617bc5e..98097cf81 100644 --- a/docs/eventing/samples/iot-core/trigger.yaml +++ b/docs/eventing/samples/iot-core/trigger.yaml @@ -1,4 +1,4 @@ -apiVersion: eventing.knative.dev/v1alpha1 +apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: iot-demo diff --git a/docs/eventing/samples/kafka/channel/020-k8s-events.yaml b/docs/eventing/samples/kafka/channel/020-k8s-events.yaml index 653bf85d8..131b028c8 100644 --- a/docs/eventing/samples/kafka/channel/020-k8s-events.yaml +++ b/docs/eventing/samples/kafka/channel/020-k8s-events.yaml @@ -11,6 +11,6 @@ spec: kind: Event sink: ref: - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default diff --git a/docs/eventing/samples/kafka/channel/030-trigger.yaml b/docs/eventing/samples/kafka/channel/030-trigger.yaml index 2b08d138f..eb99c8a50 100644 --- a/docs/eventing/samples/kafka/channel/030-trigger.yaml +++ b/docs/eventing/samples/kafka/channel/030-trigger.yaml @@ -1,4 +1,4 @@ -apiVersion: eventing.knative.dev/v1alpha1 +apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: testevents-trigger diff --git a/docs/eventing/samples/kubernetes-event-source/README.md b/docs/eventing/samples/kubernetes-event-source/README.md index 1c6a43ccc..a3cdc1a13 100644 --- a/docs/eventing/samples/kubernetes-event-source/README.md +++ b/docs/eventing/samples/kubernetes-event-source/README.md @@ -100,7 +100,7 @@ all the YAML files deployed in this sample to point at that namespace. kind: Event sink: ref: - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default ``` @@ -123,7 +123,7 @@ simple Knative Service that dumps incoming messages to its log and creates a 1. Create a file named `trigger.yaml` and copy the code block below into it. ```yaml - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: testevents-trigger diff --git a/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml b/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml index 44a0912e1..b1b4747c4 100644 --- a/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml +++ b/docs/eventing/samples/kubernetes-event-source/k8s-events.yaml @@ -11,6 +11,6 @@ spec: kind: Event sink: ref: - apiVersion: eventing.knative.dev/v1alpha1 + apiVersion: eventing.knative.dev/v1beta1 kind: Broker name: default diff --git a/docs/eventing/samples/kubernetes-event-source/trigger.yaml b/docs/eventing/samples/kubernetes-event-source/trigger.yaml index f472528d4..7b21ec0c6 100644 --- a/docs/eventing/samples/kubernetes-event-source/trigger.yaml +++ b/docs/eventing/samples/kubernetes-event-source/trigger.yaml @@ -1,4 +1,4 @@ -apiVersion: eventing.knative.dev/v1alpha1 +apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: testevents-trigger diff --git a/docs/eventing/samples/sequence/sequence-reply-to-sequence/README.md b/docs/eventing/samples/sequence/sequence-reply-to-sequence/README.md index 742878ce5..1e0265374 100644 --- a/docs/eventing/samples/sequence/sequence-reply-to-sequence/README.md +++ b/docs/eventing/samples/sequence/sequence-reply-to-sequence/README.md @@ -144,7 +144,7 @@ spec: reply: ref: kind: Sequence - apiVersion: flows.knative.dev/v1alpha1 + apiVersion: flows.knative.dev/v1beta1 name: second-sequence ``` diff --git a/docs/eventing/samples/sequence/sequence-with-broker-trigger/README.md b/docs/eventing/samples/sequence/sequence-with-broker-trigger/README.md index d6c88bbd2..f5f883157 100644 --- a/docs/eventing/samples/sequence/sequence-with-broker-trigger/README.md +++ b/docs/eventing/samples/sequence/sequence-with-broker-trigger/README.md @@ -196,7 +196,7 @@ spec: containers: - image: gcr.io/knative-releases/knative.dev/eventing-contrib/cmd/appender --- -apiVersion: eventing.knative.dev/v1alpha1 +apiVersion: eventing.knative.dev/v1beta1 kind: Trigger metadata: name: display-trigger