Content Updates #36

Content Updates

Author: danielhelfand

workshop/content/concepts.adoc

@@ -1,4 +1,7 @@
-Tekton defines a number of link:https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/[Kubernetes custom resources] as building blocks in order to standardize pipeline concepts and provide a terminology that is consistent across CI/CD solutions. These custom resources are an extension of the Kubernetes API that let users create and interact with these objects using the OpenShift CLI (`oc`), `kubectl`, and other Kubernetes tools.
+Tekton defines a number of link:https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/[Kubernetes custom resources]
+as building blocks in order to standardize pipeline concepts and provide a terminology
+that is consistent across CI/CD solutions. These custom resources are an extension of the
+Kubernetes API that let users create and interact with these objects using the OpenShift CLI (`oc`), `kubectl`, and other Kubernetes tools.
 
 The custom resources needed to define a pipeline are listed below:
 
@@ -16,6 +19,7 @@ In short, in order to create a pipeline, one does the following:
 * Create a pipeline and pipeline resources to define your application's delivery pipeline
 * Create a pipelinerun to instantiate and invoke the pipeline
 
-For further details on pipeline concepts, refer to the link:https://github.com/tektoncd/pipeline/tree/master/docs#learn-more[Tekton documentation] that provides an excellent guide for understanding various parameters and attributes available for defining `pipelines`.
+For further details on pipeline concepts, refer to the link:https://github.com/tektoncd/pipeline/tree/master/docs#learn-more[Tekton documentation]
+that provides an excellent guide for understanding various parameters and attributes available for defining pipelines.
 
 In the following sections, you will go through each of the above steps to define and execute a pipeline.

workshop/content/exercises/create-pipeline.adoc

@@ -54,6 +54,10 @@ Each pipeline has a `tasks` property. Under this property, each `task` has a `na
 For this pipeline, it has two tasks named `build` and `deploy`. The `taskRef` property under each
 task `name` is where the tasks you just created can be specified as part of the pipeline.
 
+A visual that shows how `s2i-nodejs` is part of the pipeline above can be seen below:
+
+image:../images/task-visual.png[s2i-nodejs Visualization]
+
 You might have noticed that there are no references to the nodejs-ex git repository
 and its image in the registry. That's because pipelines in Tekton are designed to
 be generic and reusable across environments and stages through the application's lifecycle.
@@ -74,6 +78,11 @@ defined between the tasks via `inputs` and `outputs` as well as explicit orders
 that are defined via `runAfter`. You'll notice the `deploy` task above has a `runAfter`
 property specifying to only execute after the `build` task is complete.
 
+A visualization of the pipeline above is shown below to help illustrate what has been
+described so far in this section:
+
+image:../images/pipeline-visual.png[Pipeline Visualization]
+
 Create the Pipeline
 -------------------
 

workshop/content/exercises/serviceaccount.adoc

@@ -26,7 +26,7 @@ later in this workshop. This is how you will connect the `pipeline` service acco
 to the pipelinerun.
 
 For reference, you can add the permissions used by `pipeline` to a service account
-using the OpenShift CLI (`oc`) commands below:
+using the `oc` commands below:
 
 [source,bash]
 ----

workshop/content/exercises/trigger-pipeline.adoc

@@ -33,11 +33,6 @@ spec:
 Under the `spec` property, you'll see the `pipelineRef` property where the pipeline
 to be used is specified. You should see the name of the pipeline you created (i.e. `deploy-pipeline`).
 
-Since this pipelinerun will be triggered manually by you using `tkn`, the `trigger`
-property is set to `manual`. The `trigger` property is used to specify when the pipeline
-should execute. This property is how a webhook can be used to trigger a pipelinerun
-via a code commit to a git repository instead of triggering manually.
-
 The last property of the pipelinerun of note is `resources`. This is how the specific
 git repository and image registry urls can be entered for the pipelinerun. You'll
 see the pipeline resource references you just created in the pipelinerun definition.

workshop/content/images/pipeline-visual.png

@@ -22,6 +22,10 @@ Next, you would click on the **Integration & Delivery** category to find the
 
 image:images/operatorhub.png[OpenShift OperatorHub]
 
+Having trouble viewing the photo above? Simply drag the divider that separates the workshop content 
+you are reading now from the terminal towards the right. This will expand photos to make
+them easier to see.
+
 Click on **OpenShift Pipelines Operator**, **Continue**, and then **Install** as
 shown below:
 

workshop/content/images/task-visual.png

@@ -0,0 +1,19 @@
+Continuous Integration, Continuous Delivery (CI/CD)
+--------------------------------------------------
+
+A continuous integration, continuous delivery (CI/CD) pipeline is an automated expression
+of your process for getting software from version control right through to your users and customers.
+Every change to your software (i.e. committed in source control) goes through a complex
+process on its way to being released. This process involves building the software in a
+reliable and repeatable manner as well as progressing the built software (called a "build")
+through multiple stages of testing and deployment.
+
+Kubernetes
+----------
+
+Kubernetes is an open-source system for automating deployment, scaling, and management
+of containerized applications.
+
+As OpenShift is a platform based on Kubernetes, there will be Kubernetes concepts
+used throughout this workshop. The workshop assumes that attendees will have knowledge
+of Kubernetes fundamental concepts.

workshop/content/install-tekton-operator.adoc

@@ -1,4 +1,6 @@
 modules:
+    workshop-introduction:
+        name: Workshop Introduction
     workshop-overview:
         name: Workshop Overview
     concepts:

workshop/content/workshop-introduction.adoc

@@ -2,6 +2,7 @@ name: OpenShift Pipelines with Tekton
 
 modules:
     activate:
+    - workshop-introduction
     - workshop-overview
     - concepts
     - install-tekton-operator