Merge pull request #107 from kameshsampath/upgrade/v0.4.0

Upgrade/v0.4.0

Author: kameshsampath

05-build/knative/service-with-build-template.yaml

@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: event-greeter
 spec:
-  runLatest:
+  runLatest: 
     configuration:
       build:
         apiVersion: build.knative.dev/v1alpha1

06-eventing/knative/service.yaml

@@ -11,4 +11,4 @@ spec:
             app: event-greeter
         spec:
           container:
-            image: docker.io/kameshsampath/event-greeter:0.0.1
+            image: $destinationImageName

06-eventing/knative/templates/service.jsonnet

@@ -88,7 +88,7 @@ spec:
 
 The build done by the build steps of the template is exactly same like what was done by xref:ROOT:05-build/build.adoc#build-create-build[raw build], but templates gives flexibility and ease of configuration via parameters. The template step(s) modifications are transparent to the consumers (the builds inheriting the template), the builds using the template will automatically inherit the modified steps.
 
-[#build-template-generate-service]
+[#build-template-edit-service]
 === Edit Knative service
 
 Run the following command to create the knative service that will use the image created by the Knative build template we defined earlier.

documentation/modules/ROOT/pages/05-build/build-templates.adoc

@@ -29,7 +29,7 @@ Navigate to tutorial chapter's `knative` folder:
 
 [source,bash,subs="+macros,+attributes"]
 ----
-cd $TUTORIAL_HOME/05-eventing/knative
+cd $TUTORIAL_HOME/{eventing-repo}/knative
 ----
 
 Run the following commands to create the channel:
@@ -96,12 +96,12 @@ spec:
 <1> The type of event source, the eventing system deploys a bunch of sources out of the box and it also provides way to deploy custom resources
 <2> The channel(sink) where the event data will be drained
 
-[NOTE]
+[NOTE,subs="macros+"]
 ====
 Event Source can define the attributes that it wishes to receive via the 
 spec.  In the above example it defines **schedule**(the the cron expression) and **data** that will be sent as part of the event.
 
-When you xref:06-eventing/eventing.adoc#eventing-watch-logs[watch logs], you will notice this data being delivered to the service.
+When you xref:{eventing-repo}/eventing.adoc#eventing-watch-logs[watch logs], you will notice this data being delivered to the service.
 ====
 
 Run the following commands to create the event source resources:
@@ -256,25 +256,14 @@ Navigate to tutorial chapter's `templates` folder:
 
 [source,bash,subs="+macros,+attributes"]
 ----
-cd $TUTORIAL_HOME/05-eventing/knative/templates
+cd $TUTORIAL_HOME/{eventing-repo}/knative/templates
 ----
 
 Run the following command to create the knative service that will be used as the subscriber for the cron events:
 
 [source,bash,subs="+macros,+attributes",linenums]
 ----
-
-jsonnet --ext-str image='<your-docker-image-name>' \
-   link:{github-repo}/{eventing-repo}/knative/templates/service.jsonnet[service.jsonnet]\
-   | yq r - | tee ../service.yaml
-----
-
-(e.g)
-[source,bash,subs="+macros,+attributes",linenums]
-----
-jsonnet --ext-str image='docker.io/demo/event-greeter:0.0.1' \
-   link:{github-repo}/{eventing-repo}/knative/templates/service.jsonnet[service.jsonnet] \
-    | yq r - | tee ../service.yaml
+pass:[ sed -i "s~\$destinationImageName~${DESTINATION_IMAGE_NAME}~g" service-with-build-template.yaml ]
 ----
 
 [.text-center]
@@ -297,11 +286,13 @@ spec:
             image: docker.io/demo/event-greeter:0.0.1 <1>
 ----
 
-<1> Set from `image` parameter --  the fully qualified container image that will be pushed to the registry as part of the build --
+<1> Set from `${DESTINATION_IMAGE_NAME}` environment variable --  the fully qualified container image that will be pushed to the registry as part of the build --
+
+Refer to xref:ROOT:05-build/build.adoc#build-set-env[Build Environment Variables]
 
-[NOTE]
+[NOTE,subs="macros+"]
 ====
-If you have skipped the xref:ROOT:05-build/build.adoc[Build] or xref:ROOT:05-build/build-templates.adoc[Build Templates] do not have the container image of `event-greeter`; then you can update the Knative serving service to use the pre-built event-greeter image available at `quay.io/rhdevelopers/knative-tutorial-event-greeter:0.0.1`
+If you have skipped the xref:ROOT:{build-repo}/build.adoc[Build] or xref:ROOT:{build-repo}/build-templates.adoc[Build Templates] do not have the container image of `event-greeter`; then you can update the Knative serving service to use the pre-built event-greeter image available at `quay.io/rhdevelopers/knative-tutorial-event-greeter:0.0.1`
 ====
 
 [#eventing-deploy-subscriber-service]
@@ -311,7 +302,7 @@ Navigate to tutorial chapter's `knative` folder:
 
 [source,bash,subs="+macros,+attributes"]
 ----
-cd $TUTORIAL_HOME/05-eventing/knative
+cd $TUTORIAL_HOME/{eventing-repo}/knative
 ----
 
 Run the following commands to create the service:
@@ -328,7 +319,7 @@ kubectl apply -n knativetutorial -f service.yaml
 oc apply -n knativetutorial -f service.yaml 
 ----
 
-You can xref:06-eventing/eventing.adoc#eventing-watch-logs[watch logs] to see the cron job source sending an event every 1 minute.
+You can xref:{eventing-repo}/eventing.adoc#eventing-watch-logs[watch logs] to see the cron job source sending an event every 1 minute.
 
 [#eventing-cleanup]
 == Cleanup

documentation/modules/ROOT/pages/06-eventing/eventing-src-sub.adoc

@@ -10,7 +10,7 @@ Navigate to the tutorial chapter's `knative` folder:
 
 [source,bash,subs="+macros,+attributes"]
 ----
-cd $TUTORIAL_HOME/05-eventing/knative
+cd $TUTORIAL_HOME/{eventing-repo}/knative
 ----
 
 [#eventing-create-event-source]
@@ -107,29 +107,11 @@ cronjob-event-greeter-cronjob-source-4v9vq-6bff96b58f-tgrhj   2/2       Running
 [#eventing-gen-sink-service]
 === Generate Sink Service
 
-Navigate to tutorial chapter's `templates` folder:
-
-[source,bash,subs="+macros,+attributes"]
-----
-cd $TUTORIAL_HOME/05-eventing/knative/templates
-----
-
 Run the following command to create the Knative service that will be used as the subscriber for the cron events:
 
 [source,bash,subs="+macros,+attributes",linenums]
 ----
-
-jsonnet --ext-str image='<your-docker-image-name>' \
-   link:{github-repo}/{eventing-repo}/knative/templates/service.jsonnet[service.jsonnet]\
-   | yq r - | tee ../service.yaml
-----
-
-(e.g)
-[source,bash,subs="+macros,+attributes",linenums]
-----
-jsonnet --ext-str image='docker.io/demo/event-greeter:0.0.1' \
-   link:{github-repo}/{eventing-repo}/knative/templates/service.jsonnet[service.jsonnet] \
-    | yq r - | tee ../service.yaml
+pass:[ sed -i "s~\$destinationImageName~${DESTINATION_IMAGE_NAME}~g" service-with-build-template.yaml ]
 ----
 
 [.text-center]
@@ -152,23 +134,18 @@ spec:
             image: docker.io/demo/event-greeter:0.0.1 <1>
 ----
 
-<1> Set from `image` parameter --  the fully qualified container image that will be pushed to the registry as part of the build --
+<1> Set from `${DESTINATION_IMAGE_NAME}` environment variable --  the fully qualified container image that will be pushed to the registry as part of the build --
 
-[NOTE]
+Refer to xref:ROOT:05-build/build.adoc#build-set-env[Build Environment Variables]
+
+[NOTE,subs="macros+"]
 ====
-If you have skipped the xref:ROOT:05-build/build.adoc[Build] or xref:ROOT:05-build/build-templates.adoc[Build Templates] do not have the container image of `event-greeter`; then you can update the Knative serving service to use the pre-built event-greeter image available at `quay.io/rhdevelopers/knative-tutorial-event-greeter:0.0.1`
+If you have skipped the xref:ROOT:{build-repo}/build.adoc[Build] or xref:ROOT:05-build/build-templates.adoc[Build Templates] and dont have the container image of `event-greeter`; then you can update the Knative serving service to use the pre-built event-greeter image available at `quay.io/rhdevelopers/knative-tutorial-event-greeter:0.0.1`
 ====
 
 [#eventing-deploy-sink-service]
 === Deploy Sink Service
 
-Navigate to tutorial chapter's `knative` folder:
-
-[source,bash,subs="+macros,+attributes"]
-----
-cd $TUTORIAL_HOME/05-eventing/knative
-----
-
 Run the following commands to create the service:
 
 [source,bash,subs="+macros,+attributes"]

documentation/modules/ROOT/pages/06-eventing/eventing-src-svc.adoc

@@ -33,7 +33,7 @@ The logs will have the output like below printing every minute.
   "ID" : "1549548420001445196-715",
   "EventTime" : "2019-02-07T14:07:00.001470981Z",
   "Body" : "{\"message\": \"Thanks for doing Knative Tutorial\"}",
-  "host" : "Event greeter => 'event-greeter-00001-deployment-84f879ff6d-88rxb' : 3 ",
+  "host" : "Event  greeter => 'event-greeter-rz7lz-pod-938e74' : 1",
   "time" : "14:07:00"
 }
 ----
@@ -45,7 +45,7 @@ The logs will have the output like below printing every minute.
   "ID" : "1549548420001445196-715",
   "EventTime" : "2019-02-07T14:07:00.001470981Z",
   "Body" : "{\"message\": \"Thanks for doing Knative Tutorial\"}",
-  "host" : "Event greeter v0.0.2 => 'event-greeter-00001-deployment-84f879ff6d-88rxb' : 3 ",
+  "host" : "Event  greeter => 'event-greeter-rz7lz-pod-938e74' : 1",
   "time" : "14:07:00"
 }
 ----