Merge pull request #41712 from abrennan89/021022

SRVCOM-1288 + SRVCOM-1664: Clean up attributes, prereqs

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -3181,7 +3181,7 @@ Topics:
     File: serverless-functions-about
   - Name: Event sources
     File: knative-event-sources
-  - Name: Channels
+  - Name: Channels and subscriptions
     File: serverless-channels
 - Name: Install
   Dir: install
@@ -3218,9 +3218,9 @@ Topics:
     File: serverless-pingsource
   - File: serverless-custom-event-sources
     Name: Custom event sources
-  - Name: Creating and deleting channels
+  - Name: Creating channels
     File: serverless-creating-channels
-  - Name: Subscriptions
+  - Name: Creating subscriptions
     File: serverless-subs
 # Brokers
   - Name: Brokers

modules/serverless-containersource-guidelines.adoc

@@ -1,3 +1,8 @@
+// Module included in the following assemblies:
+//
+// * /serverless/develop/serverless-custom-event-sources.adoc
+
+:_content-type: REFERENCE
 [id="serverless-containersource-guidelines_{context}"]
 = Guidelines for creating a container image
 

modules/serverless-containersource-reference.adoc

@@ -1,3 +1,8 @@
+// Module included in the following assemblies:
+//
+// * /serverless/develop/serverless-custom-event-sources.adoc
+
+:_content-type: REFERENCE
 [id="serverless-containersource-reference_{context}"]
 = Container source reference
 

modules/serverless-create-channel-kn.adoc

@@ -1,3 +1,7 @@
+// Module included in the following assemblies:
+//
+//  * /serverless/develop/serverless-creating-channels.adoc
+
 :_content-type: PROCEDURE
 [id="serverless-create-channel-kn_{context}"]
 = Creating a channel by using the Knative CLI
@@ -6,9 +10,7 @@ You can create a channel with the cluster default configuration by using the `kn
 
 .Prerequisites
 
-To create channels using the `kn` CLI, ensure that:
-
-* The {ServerlessOperatorName} and Knative Eventing are installed on your {product-title} cluster.
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
 * You have installed the `kn` CLI.
 * You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 
@@ -51,3 +53,12 @@ kn channel list
 NAME        TYPE              URL                                                     AGE   READY   REASON
 mychannel   InMemoryChannel   http://mychannel-kn-channel.default.svc.cluster.local   93s   True
 ----
+
+.Deleting a channel
+
+* Delete a channel:
++
+[source,terminal]
+----
+$ kn channel delete <channel_name>
+----

modules/serverless-create-channel-odc.adoc

@@ -1,29 +1,23 @@
 // Module included in the following assemblies:
 //
-//  * serverless/knative_eventing/serverless-creating-channels.adoc
+//  * /serverless/develop/serverless-creating-channels.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-create-channel-odc_{context}"]
-= Creating a channel using the Developer perspective
+= Creating a channel by using the web console
 
-You can create a channel with the cluster default configuration by using the {product-title} web console.
+You can create a channel by using the {product-title} web console.
 
 .Prerequisites
-To create channels using the *Developer* perspective ensure that:
 
+* You have logged in to the {product-title} web console.
 * The {ServerlessOperatorName} and Knative Eventing are installed on your {product-title} cluster.
-* You have logged in to the web console.
 * You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 
 .Procedure
 
 . In the *Developer* perspective, navigate to *+Add* -> *Channel*.
 . Select the type of `Channel` object that you want to create from the *Type* drop-down.
-+
-[NOTE]
-====
-Currently only InMemoryChannel type `Channel` objects are supported.
-====
 . Click *Create*.
 
 .Verification

modules/serverless-create-default-channel-yaml.adoc

@@ -1,23 +1,22 @@
 // Module included in the following assemblies:
 //
-//  * serverless/channels/serverless-creating-channels.adoc
+//  * /serverless/develop/serverless-creating-channels.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-create-default-channel-yaml_{context}"]
 = Creating a default implementation channel by using YAML
 
-You can create a channel by using YAML with the cluster default configuration.
+You can create a channel with the cluster default configuration by using YAML.
 
 .Prerequisites
 
-* {ServerlessOperatorName} and Knative Eventing are installed on your {product-title} cluster.
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
+* You have installed the `oc` CLI.
 * You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 
 .Procedure
 
-To create a `Channel` object:
-
-. Create a YAML file and copy the following sample code into it:
+. Create a `Channel` object as a YAML file:
 +
 [source,yaml]
 ----
@@ -27,6 +26,7 @@ metadata:
   name: example-channel
   namespace: default
 ----
+
 . Apply the YAML file:
 +
 [source,terminal]

modules/serverless-create-kafka-channel-yaml.adoc

@@ -12,6 +12,7 @@ You can create a Kafka channel by using YAML to create the `KafkaChannel` object
 .Prerequisites
 
 * The {ServerlessOperatorName}, Knative Eventing, and the `KnativeKafka` custom resource are installed on your {product-title} cluster.
+* You have installed the `oc` CLI.
 * You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 
 .Procedure

modules/serverless-creating-subscriptions-kn.adoc

@@ -1,13 +1,15 @@
+// Module included in the following assemblies:
+//
+// * /serverless/develop/serverless-subs.adoc
+
 :_content-type: PROCEDURE
 [id="serverless-creating-subscriptions-kn_{context}"]
-= Creating subscriptions by using the Knative CLI
+= Creating a subscription by using the Knative CLI
 
 You can create a subscription to connect a channel to a sink by using the `kn` CLI.
 
 .Prerequisites
 
-To create subscriptions using the `kn` CLI, ensure that:
-
 * The {ServerlessOperatorName} and Knative Eventing are installed on your {product-title} cluster.
 * You have installed the `kn` CLI.
 * You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
@@ -57,3 +59,12 @@ $ kn subscription list
 NAME            CHANNEL             SUBSCRIBER           REPLY   DEAD LETTER SINK   READY   REASON
 mysubscription   Channel:mychannel   ksvc:event-display                              True
 ----
+
+.Deleting a subscription
+
+* Delete a subscription:
++
+[source,terminal]
+----
+$ kn subscription delete <subscription_name>
+----

modules/serverless-creating-subscriptions-odc.adoc

@@ -1,22 +1,26 @@
 // Module included in the following assemblies:
 //
-// * serverless/channel/serverless-subs.adoc
+// * /serverless/develop/serverless-subs.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-creating-subscriptions-odc_{context}"]
-= Creating subscriptions in the Developer perspective
+= Creating a subscription by using the web console
+
+You can create a subscription to connect a channel to a sink by using the {product-title} web console.
 
 .Prerequisites
-To create subscriptions using the *Developer* perspective, ensure that:
 
 * The {ServerlessOperatorName}, Knative Serving, and Knative Eventing are installed on your {product-title} cluster.
 * You have logged in to the web console.
-* You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 * You have created an event sink, such as a Knative service, and a channel.
+* You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
 
 .Procedure
+
 . In the *Developer* perspective, navigate to the *Topology* page.
+
 . Create a subscription using one of the following methods:
+
 .. Hover over the channel that you want to create a subscription for, and drag the arrow. The *Add Subscription* option is displayed.
 +
 image::create-sub-ODC.png[Create a subscription for the channel]
@@ -25,10 +29,8 @@ image::create-sub-ODC.png[Create a subscription for the channel]
 ... Click *Add*.
 .. If the service is available in the *Topology* view under the same namespace or project as the channel, click on the channel that you want to create a subscription for, and drag the arrow directly to a service to immediately create a subscription from the channel to that service.
 
-
 .Verification
+
 * After the subscription has been created, you can see it represented as a line that connects the channel to the service in the *Topology* view:
 +
 image::verify-subscription-odc.png[Subscription in the Topology view]
-+
-You can view the event source, channel, and subscriptions for the sink by clicking on the service.

modules/serverless-creating-subscriptions-yaml.adoc

@@ -1,16 +1,22 @@
 // Module included in the following assemblies:
 //
-//  * serverless/channels/serverless-subs.adoc
+// * /serverless/develop/serverless-subs.adoc
 
 :_content-type: PROCEDURE
 [id="serverless-creating-subscriptions-yaml_{context}"]
-= Creating subscriptions by using YAML
+= Creating a subscription by using YAML
 
 You can create a subscription to connect a channel to a sink by using YAML.
 
+.Prerequisites
+
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
+* You have installed the `oc` CLI.
+* You have created a project or have access to a project with the appropriate roles and permissions to create applications and other workloads in {product-title}.
+
 .Procedure
 
-* Create a `Subscription` object.
+* Create a `Subscription` object:
 ** Create a YAML file and copy the following sample code into it:
 +
 [source,yaml]