updated to latest

Author: kameshsampath

README.adoc

@@ -20,16 +20,17 @@ An OpenShift4 cluster with following components:
 [source,bash]
 ----
 oc new-project tutorial && \
-oc create serviceaccount pipeline && \
+! oc create serviceaccount pipeline && \
 oc adm policy add-scc-to-user privileged -z pipeline && \
 oc adm policy add-role-to-user edit -z pipeline && \
 oc adm policy add-scc-to-user privileged -z default && \
 oc adm policy add-scc-to-user anyuid -z default && \
-oc create -f https://raw.githubusercontent.com/redhat-developer-demos/pipelines-catalog/master/knative-client/pipeline-sa-roles.yaml -n tutorial && \
+oc create -f https://raw.githubusercontent.com/redhat-developer-demos/tutorials-pipelines/pipelines-common/pipeline-role-sa.yaml
+ -n tutorial && \
 oc policy add-role-to-user pipeline-roles -z pipeline --role-namespace=tutorial
 ----
 
-== Deploy Nexus
+== Deploy Nexus(Optional)
 
 To make maven builds faster, we will deploy Sonatype Nexus
 
@@ -44,11 +45,15 @@ Create the following Tekton tasks which will be used in the `Pipelines`
 
 [source,bash]
 ----
-oc create -f https://raw.githubusercontent.com/tektoncd/catalog/master/openshift-client/openshift-client-task.yaml \
-  -f https://raw.githubusercontent.com/redhat-developer-demos/pipelines-catalog/master/quarkus/s2i-quarkus-task.yaml \
-  -f https://raw.githubusercontent.com/redhat-developer-demos/pipelines-catalog/master/quarkus/quarkus-native-task.yaml \
-  -f https://raw.githubusercontent.com/redhat-developer-demos/pipelines-catalog/master/quarkus/quarkus-jvm-task.yaml \
-  -f https://raw.githubusercontent.com/redhat-developer-demos/pipelines-catalog/master/knative-client/kn-service-create-task.yaml
+oc create -n tutorial \
+  -f https://raw.githubusercontent.com/tektoncd/catalog/master/kn/kn.yaml
+
+oc create -n tutorial \
+-f https://raw.githubusercontent.com/tektoncd/catalog/master/openshift-client/openshift-client-task.yaml
+
+oc create -n tutorial \
+  -f https://raw.githubusercontent.com/redhat-developer-demos/knative-tutorial/master/06-pipelines/build-app-task.yaml
+
 ----
 
 Check the tasks created
@@ -60,11 +65,10 @@ tkn task ls
 
 ```
 NAME                AGE
-kn-create-service   12 seconds ago
-openshift-client    13 seconds ago
-quarkus-jvm         12 seconds ago
-quarkus-native      12 seconds ago
-s2i-quarkus         13 seconds ago
+NAME               AGE
+build-app          3 seconds ago
+kn                 5 seconds ago
+openshift-client   4 seconds ago
 ```
 
 == Application Deployment
@@ -93,8 +97,17 @@ oc create -f pipelines-common/resources.yaml \
 
 [source,bash]
 ----
+# create customer deployment config 
 oc create -f customer/app.yaml
-oc create -f customer/pipeline-run.yaml
+
+# start the customer deploy pipeline 
+tkn pipeline start rhd-tutorial-deploy \
+ --param="applicationSrcDir=customer" \
+ --param="deploymentConfig=customer" \
+ --param="mavenMirrorUrl=http://nexus:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source" \
+ --resource="app-image=customer-openshift-image" \
+ --serviceaccount='pipeline' 
 ----
 
 Watch the logs of pipeline run using the command 
@@ -110,8 +123,17 @@ tkn pipelinerun logs -a -f <id-from-previous-command>
 
 [source,bash]
 ----
-oc create -f preference/app.yaml \
-   -f preference/pipeline-run.yaml
+# create preference deployment config 
+oc create -f preference/app.yaml
+
+# start preference deployment pipeline
+tkn pipeline start rhd-tutorial-deploy \
+ --param="applicationSrcDir=preference" \
+ --param="deploymentConfig=preference" \
+ --param="mavenMirrorUrl=http://nexus:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source" \
+ --resource="app-image=preference-openshift-image" \
+ --serviceaccount='pipeline' 
 ----
 
 Watch the logs of pipeline run using the command 
@@ -133,15 +155,27 @@ tkn pipelinerun logs -a -f <id-from-previous-command>
 
 [source,bash]
 ----
-oc create -f recommendation/app-v1.yaml \
-  -f recommendation/pipeline-run.yaml
+oc create -f recommendation/app-v1.yaml
+
+tkn pipeline start rhd-tutorial-deploy \
+ --param="applicationSrcDir=recommendation" \
+ --param="deploymentConfig=recommendation" \
+ --param="mavenMirrorUrl=http://nexus:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source" \
+ --resource="app-image=recommendation-openshift-image-v1" \
+ --serviceaccount='pipeline' 
 ----
 
 ==== Knative Service Deployment
 
 [source,bash]
 ----
-oc create -f recommendation/kn-pipeline-run.yaml
+tkn pipeline start rhd-tutorial-kn-deploy \
+ --param="applicationSrcDir=recommendation" \
+ --param="mavenMirrorUrl=http://nexus:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source" \
+ --resource="app-image=recommendation-openshift-image-v1" \
+ --serviceaccount='pipeline' 
 ----
 
 Watch the logs of pipeline run using the command 
@@ -160,15 +194,27 @@ tkn pipelinerun logs -a -f <id-from-previous-command>
 
 [source,bash]
 ----
-oc create -f recommendation/app-v2.yaml \
-  -f recommendation/pipeline-run-v2.yaml
+oc create -f recommendation/app-v2.yaml 
+
+tkn pipeline start rhd-tutorial-deploy \
+ --param="applicationSrcDir=recommendation" \
+ --param="deploymentConfig=recommendation" \
+ --param="mavenMirrorUrl=http://nexus:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source-v2" \
+ --resource="app-image=recommendation-openshift-image-v2" \
+ --serviceaccount='pipeline' 
 ----
 
 ==== Knative Service Deployment
 
 [source,bash]
 ----
-oc create -f recommendation/kn-pipeline-v2-run.yaml
+tkn pipeline start rhd-tutorial-kn-deploy \
+ --param="applicationSrcDir=recommendation" \
+ --param="mavenMirrorUrl=http://nexus.rhd-workshop-infra:8081/nexus/content/groups/public" \
+ --resource="app-git=git-source-v2" \
+ --resource="app-image=recommendation-openshift-image-v2" \
+ --serviceaccount='pipeline' 
 ----
 
 Watch the logs of pipeline run using the command 

customer/pipeline-run.yaml

@@ -10,13 +10,11 @@ spec:
       value: customer
     - name: applicationSrcDir
       value: customer
-  trigger:
-    type: manual
-  serviceAccount: 'pipeline'
+  serviceAccount: "pipeline"
   resources:
-  - name: app-git
-    resourceRef:
-      name: korea-keynote-demo-git
-  - name: app-image
-    resourceRef:
-      name: customer-openshift-image
+    - name: app-git
+      resourceRef:
+        name: korea-keynote-demo-git
+    - name: app-image
+      resourceRef:
+        name: customer-openshift-image

pipelines-common/pipeline-deploy.yaml

@@ -4,40 +4,43 @@ metadata:
   name: rhd-tutorial-deploy
 spec:
   resources:
-  - name: app-git
-    type: git
-  - name: app-image
-    type: image
+    - name: app-git
+      type: git
+    - name: app-image
+      type: image
   params:
     - name: deploymentConfig
       description: The application name i.e. OpenShift/Kubernetes Deployment name
     - name: applicationSrcDir
       description: The source directory of the application within the source repository
   tasks:
-  - name: build
-    taskRef:
-      name: quarkus-native
-    params:
-      - name: tlsVerify
-        value: "false"
-      - name: contextDir
-        value: "${params.applicationSrcDir}"
-      # if you have different repository manager update the value below
-      # if don't wish to use nexus or repo manager then comment the name/value below
-      - name: mavenMirrorUrl
-        value: 'http://nexus:8081/nexus/content/groups/public'
-    resources:
-      inputs:
-      - name: source
-        resource: app-git
-      outputs:
-      - name: image
-        resource: app-image
-  - name: deploy
-    taskRef:
-      name: openshift-client
-    runAfter:
-      - build
-    params:
-    - name: ARGS
-      value: "rollout latest ${params.deploymentConfig}"
+    - name: build
+      taskRef:
+        name: build-app
+      params:
+        - name: contextDir
+          value: "$(params.applicationSrcDir)"
+        # if you have different repository manager update the value below
+        # if don't wish to use nexus or repo manager then comment the name/value below
+        - name: mavenMirrorUrl
+          value: "http://nexus.rhd-workshop-infra:8081/nexus/content/groups/public"
+        - name: dockerFile
+          value: "Dockerfile"
+      resources:
+        inputs:
+          - name: source
+            resource: app-git
+        outputs:
+          - name: builtImage
+            resource: app-image
+    - name: deploy
+      taskRef:
+        name: openshift-client
+      runAfter:
+        - build
+      params:
+        - name: ARGS
+          value:
+            - "rollout"
+            - "latest"
+            - "$(params.deploymentConfig)"

pipelines-common/pipeline-kn-deploy.yaml

@@ -16,31 +16,36 @@ spec:
   tasks:
     - name: build
       taskRef:
-        name: quarkus-native
+        name: build-app
       params:
-        - name: tlsVerify
-          value: "false"
         - name: contextDir
-          value: "${params.applicationSrcDir}"
+          value: "$(params.applicationSrcDir)"
         # if you have different repository manager update the value below
         # if don't wish to use nexus or repo manager then comment the name/value below
         - name: mavenMirrorUrl
           value: "http://nexus.rhd-workshop-infra:8081/nexus/content/groups/public"
+        - name: dockerFile
+          value: "Dockerfile"
       resources:
         inputs:
           - name: source
             resource: app-git
         outputs:
-          - name: image
+          - name: builtImage
             resource: app-image
     - name: deploy
       taskRef:
-        name: kn-create-service
+        name: kn
       runAfter:
         - build
       params:
-        - name: name
-          value: ${params.serviceName}
+        - name: ARGS
+          value:
+            - "service"
+            - "create"
+            - "recommendation"
+            - "--force"
+            - "--image=$(inputs.resources.image.url)"
       resources:
         inputs:
           - name: image

pipelines-common/pipeline-role-sa.yaml

@@ -0,0 +1,60 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: pipeline-role
+  namespace: tutorial
+rules:
+- apiGroups: ["serving.knative.dev"]
+  resources: ["*"]
+  verbs: ["*"]
+- apiGroups: ["eventing.knative.dev"]
+  resources: ["*"]
+  verbs: ["*"]
+- apiGroups: ["sources.eventing.knative.dev"]
+  resources: ["*"]
+  verbs: ["*"]
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - services
+  - endpoints
+  - configmaps
+  - secrets
+  verbs:
+  - '*'
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - '*'
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+- apiGroups:
+  - apps
+  resources:
+  - replicasets
+  verbs:
+  - get
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: pipeline-role-binding
+  namespace: tutorial
+roleRef:
+  kind: Role
+  name: pipeline-role
+  apiGroup: rbac.authorization.k8s.io
+subjects:
+- kind: ServiceAccount
+  name: pipeline
+  namespace: tutorial