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

Author: abrennan89

_topic_maps/_topic_map.yml

@@ -3212,7 +3212,7 @@ Topics:
     File: serverless-event-sinks
   - Name: Event delivery
     File: serverless-event-delivery
-  - Name: Using the API server source
+  - Name: Creating an API server source
     File: serverless-apiserversource
   - Name: Creating a ping source
     File: serverless-pingsource

modules/apiserversource-kn-delete.adoc

@@ -1,15 +1,24 @@
+// Module included in the following assemblies:
+//
+// serverless/develop/serverless-apiserversource.adoc
+
 :_content-type: PROCEDURE
 [id="apiserversource-kn_{context}"]
 = Creating an API server source by using the Knative CLI
 
-This section describes the steps required to create an API server source using `kn` commands.
+You can use the following procedure to create an API server source by using the `kn` CLI.
 
 .Prerequisites
 
-* You must have {ServerlessProductName}, the Knative Serving and Eventing components, and the `kn` CLI installed.
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
+* 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 installed the `oc` CLI.
+* You have installed the `kn` CLI.
 
 .Procedure
 
+include::snippets/serverless-service-account-apiserversource.adoc[]
+
 . Create an API server source that uses a broker as a sink:
 +
 [source,terminal]
@@ -120,3 +129,26 @@ Data,
     ...
   }
 ----
+
+.Deleting the API server source
+
+. Delete the trigger:
++
+[source,terminal]
+----
+$ kn trigger delete <trigger_name>
+----
+
+. Delete the event source:
++
+[source,terminal]
+----
+$ kn source apiserver delete <source_name>
+----
+
+. Delete the service account, cluster role, and cluster binding:
++
+[source,terminal]
+----
+$ oc delete -f authentication.yaml
+----

modules/apiserversource-kn.adoc

@@ -1,74 +1,23 @@
 // Module included in the following assemblies:
 //
-// serverless/knative_eventing/serverless-listing-event-sources.adoc
+// * serverless/develop/serverless-apiserversource.adoc
 
 :_content-type: PROCEDURE
 [id="apiserversource-yaml_context"]
-= Using the API server source with the YAML method
+= Creating an API server source by using YAML files
 
-This guide describes the steps required to create an API server source using YAML files.
+You can use the following procedure to create an API server source by using YAML files.
 
 .Prerequisites
 
-* You will need to have a Knative Serving and Eventing installation.
-* You will need to have created the `default` broker in the same namespace as the one defined in the API server source YAML file.
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
+* 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 the `default` broker in the same namespace as the one defined in the API server source YAML file.
+* You have installed the `oc` CLI.
 
 .Procedure
 
-. Create a service account, role, and role binding for the API server source as a YAML file:
-+
-[NOTE]
-====
-If you want to re-use an existing service account, you can modify your existing `ServiceAccount` resource to include the required permissions instead of creating a new resource.
-====
-+
-[source,yaml]
-----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: events-sa
-  namespace: default <1>
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: event-watcher
-  namespace: default <1>
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - events
-    verbs:
-      - get
-      - list
-      - watch
-
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: k8s-ra-event-watcher
-  namespace: default <1>
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: event-watcher
-subjects:
-  - kind: ServiceAccount
-    name: events-sa
-    namespace: default <1>
-----
-<1> Change this namespace to the namespace that you have selected for installing the API server source.
-
-. Apply the YAML file:
-+
-[source,terminal]
-----
-$ oc apply -f <filename>
-----
+include::snippets/serverless-service-account-apiserversource.adoc[]
 
 . Create an API server source as a YAML file:
 +
@@ -243,3 +192,26 @@ Data,
     ...
   }
 ----
+
+.Deleting the API server source
+
+. Delete the trigger:
++
+[source,terminal]
+----
+$ oc delete -f trigger.yaml
+----
+
+. Delete the event source:
++
+[source,terminal]
+----
+$ oc delete -f k8s-events.yaml
+----
+
+. Delete the service account, cluster role, and cluster binding:
++
+[source,terminal]
+----
+$ oc delete -f authentication.yaml
+----

modules/apiserversource-yaml-delete.adoc

@@ -1,13 +1,24 @@
 // Module included in the following assemblies:
 //
-// * serverless/event_sources/serverless-apiserversource.adoc
+// * serverless/develop/serverless-apiserversource.adoc
 
 :_content-type: PROCEDURE
 [id="odc-creating-apiserversource_{context}"]
-= Creating an API server source event source using the Developer perspective
+= Creating an API server source by using the web console
+
+You can use the following procedure to create an API server source by using the {product-title} web console.
+
+.Prerequisites
+
+* You have logged in to the {product-title} web console.
+* The {ServerlessOperatorName} and Knative Eventing are installed on the cluster.
+* 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 installed the `oc` CLI.
 
 .Procedure
 
+include::snippets/serverless-service-account-apiserversource.adoc[]
+
 . In the *Developer* perspective, navigate to *+Add* → *Event Source*. The  *Event Sources* page is displayed.
 . Optional: If you have multiple providers for your event sources, select the required provider from the *Providers* list to filter the available event sources from the provider.
 . Select *ApiServerSource* and then click *Create Event Source*. The  *Create Event Source* page is displayed.
@@ -34,3 +45,10 @@ image::toplogy-odc-apiserver.png[ApiServerSource Topology view]
 ====
 If a URI sink is used, modify the URI by right-clicking on *URI sink* -> *Edit URI*.
 ====
+
+.Deleting the API server source
+
+. Navigate to the *Topology* view.
+. Right-click the API server source and select *Delete ApiServerSource*.
++
+image::delete-apiserversource-odc.png[Delete the ApiServerSource]

modules/apiserversource-yaml.adoc

@@ -1,6 +1,7 @@
 // Module included in the following assemblies:
 //
 // * serverless/develop/serverless-event-sinks.adoc
+// * serverless/develop/serverless-apiserversource.adoc
 
 :_content-type: REFERENCE
 [id="specifying-sink-flag-kn_{context}"]

modules/odc-creating-apiserversource.adoc

@@ -1,6 +1,6 @@
 :_content-type: ASSEMBLY
 [id="serverless-apiserversource"]
-= Using the API server source
+= Creating an API server source
 include::modules/common-attributes.adoc[]
 include::modules/serverless-document-attributes.adoc[]
 :context: serverless-apiserversource
@@ -9,29 +9,10 @@ toc::[]
 
 The API server source is an event source that can be used to connect an event sink, such as a Knative service, to the Kubernetes API server. The API server source watches for Kubernetes events and forwards them to the Knative Eventing broker.
 
-[id="prerequisites_serverless-apiserversource"]
-== Prerequisites
-
-* You must have a current installation of xref:../../serverless/install/install-serverless-operator.adoc#serverless-install-web-console_install-serverless-operator[{ServerlessProductName}], including Knative Serving and Eventing, in your {product-title} cluster. This can be installed by a cluster administrator.
-* Event sources need a service to use as an event _sink_. The sink is the service or application that events are sent to from the event source.
-* You must create or update a service account, role and role binding for the event source.
-
-[NOTE]
-====
-Some of the following procedures require you to create YAML files.
-
-If you change the names of the YAML files from those used in the examples, you must ensure that you also update the corresponding CLI commands.
-====
-
-// service account
-include::modules/serverless-service-ac-event-sources.adoc[leveloffset=+1]
 // dev console
 include::modules/odc-creating-apiserversource.adoc[leveloffset=+1]
-include::modules/odc-deleting-apiserversource.adoc[leveloffset=+1]
 // kn commands
 include::modules/apiserversource-kn.adoc[leveloffset=+1]
 include::modules/specifying-sink-flag-kn.adoc[leveloffset=+2]
-include::modules/apiserversource-kn-delete.adoc[leveloffset=+1]
 // YAML
 include::modules/apiserversource-yaml.adoc[leveloffset=+1]
-include::modules/apiserversource-yaml-delete.adoc[leveloffset=+1]

modules/odc-deleting-apiserversource.adoc

@@ -17,6 +17,5 @@ You can use the following commands to list, create, and manage Knative event sou
 include::modules/serverless-list-source-types-kn.adoc[leveloffset=+2]
 include::modules/serverless-kn-containersource.adoc[leveloffset=+2]
 include::modules/apiserversource-kn.adoc[leveloffset=+2]
-include::modules/apiserversource-kn-delete.adoc[leveloffset=+2]
 include::modules/serverless-pingsource-kn.adoc[leveloffset=+2]
 include::modules/serverless-kafka-source-kn.adoc[leveloffset=+2]

modules/specifying-sink-flag-kn.adoc

@@ -1,19 +1,17 @@
-// Module included in the following assemblies:
+// Snippet included in the following modules:
 //
-// serverless/knative_eventing/serverless-listing-event-sources.adoc
+// * /modules/apiserversource-yaml.adoc
+// * /modules/odc-creating-apiserversource.adoc
+// * /modules/apiserversource-kn.adoc
 
-:_content-type: PROCEDURE
-[id="serverless-service-ac-event-sources_context"]
-= Creating a service account, role, and role binding for event sources
+:_content-type: SNIPPET
 
-.Procedure
-
-. Create a service account, role, and role binding for the event source as a YAML file:
-+
 [NOTE]
 ====
 If you want to re-use an existing service account, you can modify your existing `ServiceAccount` resource to include the required permissions instead of creating a new resource.
 ====
+
+. Create a service account, role, and role binding for the event source as a YAML file:
 +
 [source,yaml]
 ----