From 64718349d0b1a11e55fd8e8cab94d2e9bc6fa5a4 Mon Sep 17 00:00:00 2001 From: Matt Moore Date: Wed, 12 Feb 2020 13:24:18 -0800 Subject: [PATCH] A couple little cleanups. (#2210) I should have caught these in code review, but I'll blame github for showing such tight code blocks ;-) 1. Couple missed artifact shortcodes, 2. Alphabetize Channels, 3. Fix some wording around Broker installation that is inaccurate. --- docs/install/knative-with-any-k8s.md | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/docs/install/knative-with-any-k8s.md b/docs/install/knative-with-any-k8s.md index 9e28dc583..f2de4856b 100644 --- a/docs/install/knative-with-any-k8s.md +++ b/docs/install/knative-with-any-k8s.md @@ -351,18 +351,10 @@ The following commands install the Knative Eventing component. kubectl apply --filename {{< artifact repo="eventing" file="eventing-core.yaml" >}} ``` -1. Install a default Channel (messaging) layer. +1. Install a default Channel (messaging) layer (alphabetical). {{< tabs name="eventing_channels" default="In-Memory (standalone)" >}} -{{% tab name="In-Memory (standalone)" %}} -The following command installs an implementation of Channel that runs in-memory. This implementation is nice because it is simple and standalone, but it is unsuitable for production use cases. - - ```bash - kubectl apply --filename {{< artifact repo="eventing" file="in-memory-channel.yaml" >}} - ``` - -{{< /tab >}} {{% tab name="Apache Kafka Channel" %}} @@ -371,7 +363,7 @@ The following command installs an implementation of Channel that runs in-memory. 1. Then install the Apache Kafka Channel: ```bash - curl -L "https://github.com/knative/eventing-contrib/releases/download/{{< version >}}/kafka-channel.yaml" \ + curl -L "{{< artifact repo="eventing-contrib" file="kafka-channel.yaml" >}}" \ | sed 's/REPLACE_WITH_CLUSTER_URL/my-cluster-kafka-bootstrap.kafka:9092/' \ | kubectl apply --filename - ``` @@ -380,6 +372,15 @@ To learn more about the Apache Kafka channel, try [our sample](../eventing/sampl {{< /tab >}} +{{% tab name="In-Memory (standalone)" %}} +The following command installs an implementation of Channel that runs in-memory. This implementation is nice because it is simple and standalone, but it is unsuitable for production use cases. + + ```bash + kubectl apply --filename {{< artifact repo="eventing" file="in-memory-channel.yaml" >}} + ``` + +{{< /tab >}} + {{% tab name="NATS Channel" %}} 1. First, [Install NATS Streaming for Kubernetes](https://github.com/knative/eventing-contrib/blob/{{< version >}}/natss/config/broker/README.md) @@ -387,7 +388,7 @@ To learn more about the Apache Kafka channel, try [our sample](../eventing/sampl 1. Then install the NATS Streaming Channel: ```bash - kubectl apply --filename https://github.com/knative/eventing-contrib/releases/download/{{< version >}}/natss-channel.yaml + kubectl apply --filename {{< artifact repo="eventing-contrib" file="natss-channel.yaml" >}} ``` {{< /tab >}} @@ -397,7 +398,7 @@ To learn more about the Apache Kafka channel, try [our sample](../eventing/sampl {{< /tabs >}} -1. Install a default Broker (eventing) layer into a namespace (in this example, default): +1. Install a default Broker (eventing) layer: {{< tabs name="eventing_brokers" default="Channel-based" >}} @@ -405,7 +406,7 @@ To learn more about the Apache Kafka channel, try [our sample](../eventing/sampl The following command installs an implementation of Broker that utilizes Channels: ```bash - kubectl apply --filename https://github.com/knative/eventing/releases/download/{{< version >}}/channel-broker.yaml + kubectl apply --filename {{< artifact repo="eventing" file="channel-broker.yaml" >}} ``` To customize which channel implementation is used, update the following ConfigMap: