Selected fixes (#255)

* Ignore .DS_Store

* Fix for build-tasks.ts

This change is necessary for newer versions of npm/typescript

bash-4.4$ npm version
{
  npm: '6.14.8',
  ares: '1.16.0',
  brotli: '1.0.6',
  cldr: '37.0',
  http_parser: '2.9.3',
  icu: '67.1',
  llhttp: '2.1.2',
  modules: '72',
  napi: '7',
  nghttp2: '1.41.0',
  node: '12.19.1',
  openssl: '1.1.1g',
  tz: '2019c',
  unicode: '13.0',
  uv: '1.39.0',
  v8: '7.8.279.23-node.44',
  zlib: '1.2.11'
}

bash-4.4$ gulp -v
CLI version: 2.3.0
Local version: 4.0.2

bash-4.4$ npx -v
10.2.2

* Fix broken kn revision command

Also remove some hard coding for greater attribute use

* Fix incorrect console output

* Fixes to the scaling pages

Fix incorrect statements and commands (e.g. default utilization rate has changed yielding 5 pods instead of 7)

* Update tag and traffic aspects of kn update so that it doesn't hang

Tested with version 0.17.0

* Updates to the Eventing section up to Source-to-Sink

Corrects a number of issues and updates output to match instructions given

* Fix Traffic Distribution

Fix incorrect path for applying knative service files

Update services so that kn and {kubernetes-cli} can be used interchangeably in this section
   - without commenting out the health check, kn command can't be used to ammend service created with CLI because validation hook would require a rename of the service

Update example files

Co-authored-by: Marc Hildenbrand <[email protected]>

Author: hatmarch

.gitignore

@@ -44,4 +44,6 @@ bin/kubectl
 gh-pages
 staging-gh-pages
 
-yarn.lock
+yarn.lock
+
+.DS_Store

build-tasks.ts

@@ -14,7 +14,7 @@ interface BuildConfig {
   cacheDir: string;
   [x: string]: unknown;
   $0: string;
-  _: string[];
+  _: (string | number)[];
 }
 
 //Antora Published Site info

documentation/modules/eventing/examples/eventing/eventinghello-source.yaml

@@ -3,8 +3,8 @@ kind: PingSource
 metadata:
   name: eventinghello-ping-source
 spec:
-  schedule: "*/2 * * * *"
-  jsonData: '{"key": "every 2 mins"}'
+  jsonData: '{"message": "Thanks for doing Knative Tutorial"}'
+  schedule: '*/2 * * * *'
   sink:
     ref:
       apiVersion: serving.knative.dev/v1

documentation/modules/eventing/nav.adoc

@@ -4,7 +4,6 @@
 ** xref:eventing-src-to-sink.adoc#eventing-sink-service[Sink Service]
 ** xref:eventing-src-to-sink.adoc#eventing-create-event-source[Create Event Source]
 ** xref:eventing-src-to-sink.adoc#eventing-verify-event-source[Verify]
-** xref:eventing-src-to-sink.adoc#eventing-see-what-you-have-deployed[See What You Have Deployed]
 ** xref:eventing-src-to-sink.adoc#eventing-cleanup[Cleanup]
 
 * xref:channel-and-subscribers.adoc[Channel and Subscribers]

documentation/modules/eventing/pages/_attributes.adoc

@@ -1,5 +1,5 @@
 :moduledir: ..
-:github-repo: https://github.com/redhat-developer-demos/knative-tutorial/blob/{branch}
+:github-repo: {repo-base}/blob/{branch}
 :basics-repo: serving
 :configs-and-routes-repo: configs-and-routes
 :scaling-repo: scaling

documentation/modules/eventing/pages/_partials/deploy-knative-resources.adoc

@@ -45,6 +45,7 @@ kn service create {sink-service-name} \
 kn source ping create eventinghello-ping-source \
   --namespace {tutorial-namespace} \
   --schedule "*/2 * * * *" \
+  --data pass:['{"message": "Thanks for doing Knative Tutorial"}'] \
   --sink ksvc:eventinghello
 ----
 #end::eventing-hello-source[]
@@ -110,7 +111,7 @@ kn trigger create {trigger-name} \
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-{kubernetes-cli} apply -n {tutorial-namespace} -f link:{github-repo}/{eventing-repo}/knative/{service-file}[{service-file}]
+{kubernetes-cli} apply -n {tutorial-namespace} -f link:{github-repo}/{eventing-repo}/{service-file}[pass:[${TUTORIAL_HOME}]/{eventing-repo}/{service-file}]
 ----
 --
 ====

documentation/modules/eventing/pages/_partials/watching-logs.adoc

@@ -1,23 +1,23 @@
-ifndef::workshop[]
-[kube-ns='knativetutorial']
-[kube-svc='']
+
+:kube-svc: eventing-hello
 
 In the eventing related subsections of this tutorial, event sources are configured to emit events every minute with a `PingSource` or with a `ContainerSource`.  
 
 The logs could be watched using the command:
 
-[source,yaml,subs="attributes+,+macros"]
+[source,yaml,subs="+attributes,+macros"]
 ----
-kubectl logs -n {kube-ns} -f <pod-name> -c user-container
+{kubernetes-cli} logs -n {tutorial-namespace} -f <pod-name> -c user-container
 ----
 
 [TIP]
 ====
 * Using stern with the command `stern  -n {kube-ns} {kube-svc}`, to filter the logs further add `-c user-container` to the stern command.
 
+[.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-stern -n {kube-ns} -c user-container {kube-svc} 
+stern -n {tutorial-namespace} -c user-container {kube-svc} 
 ----
 ====
 
@@ -43,4 +43,4 @@ event-greeter-g94kp-deployment-89f66cb58-wjl2v user-container   "message" : "Tha
 event-greeter-g94kp-deployment-89f66cb58-wjl2v user-container   "host" : "Event  greeter => 'event-greeter-5cbh5-pod-52d8fb' : 2",
 event-greeter-g94kp-deployment-89f66cb58-wjl2v user-container   "time" : "13:52:07"
 event-greeter-g94kp-deployment-89f66cb58-wjl2v user-container }
-----
+----

documentation/modules/eventing/pages/eventing-src-to-sink.adoc

@@ -127,6 +127,16 @@ kn::
 ----
 kn source ping list -n {tutorial-namespace}
 ----
+
+Running  the above command should return the following result:
+
+[.console-output]
+[source,bash]
+----
+NAME                        SCHEDULE      SINK                 AGE   CONDITIONS   READY   REASON
+eventinghello-ping-source   */2 * * * *   ksvc:eventinghello   99s   4 OK / 4     True
+----
+
 --
 {kubernetes-cli}::
 +
@@ -138,47 +148,42 @@ kubectl -n {tutorial-namespace} get \
   pingsources.sources.knative.dev \
   eventinghello-ping-source
 ----
---
-====
 
 Running  the above command should return the following result:
 
-[tabs]
-====
-kn::
-+
---
 [.console-output]
-[source,bash]
-----
-NAME                        SCHEDULE      SINK                 AGE   CONDITIONS   READY   REASON
-eventinghello-ping-source   */2 * * * *   ksvc:eventinghello   99s   4 OK / 4     True
-----
---
-{kubernetes-cli}::
-+
---
-[.console-output]
-[source,bash]
+[source,bash,subs="+macros,+attributes"]
 ----
 NAME                        SINK                                                     AGE   READY   REASON
 eventinghello-ping-source   http://eventinghello.knativetutorial.svc.cluster.local   47s   True
 ----
 --
 ====
 
+If you haven't already, you can xref:{eventing-repo}#eventing-watch-logs[watch logs] to see the ping job source sending an event every 2 minutes:
 
-You can xref:{eventing-repo}#eventing-watch-logs[watch logs] to see the ping job source sending an event every 2 minutes.
-
-[#eventing-see-what-you-have-deployed]
-== See what you have deployed
+[.console-input]
+[source,bash,subs="+macros,+attributes"]
+----
+stern eventinghello -c user-container-n {tutorial-namespace} 
+----
 
-=== sources
-include::eventing:partial$knative-objects.adoc[tag=knative-event-ping-sources]
+[.console-output]
+[source,bash,subs="quotes"]
+----
+...
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,427 INFO  [eventing-hello] (executor-thread-1) ce-id=4b59c201-56a3-4189-b042-4246d3f33504
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,501 INFO  [eventing-hello] (executor-thread-1) ce-source=/apis/v1/namespaces/user2-knativetutorial/pingsources/eventinghello-ping-source
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,501 INFO  [eventing-hello] (executor-thread-1) ce-specversion=1.0
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,501 INFO  [eventing-hello] (executor-thread-1) ce-time=2021-01-28T08:14:00.000224506Z
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,502 INFO  [eventing-hello] (executor-thread-1) ce-type=dev.knative.sources.ping
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,502 INFO  [eventing-hello] (executor-thread-1) content-type=application/json
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,502 INFO  [eventing-hello] (executor-thread-1) content-length=47
+#eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container 2021-01-28 08:14:05,502 INFO  [eventing-hello] (executor-thread-1) POST:{"message":"Thanks for doing Knative Tutorial"}#
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container I> No access restrictor found, access to any MBean is allowed
+eventinghello-2m4hn-deployment-c8f4f6758-qrjm6 user-container Jolokia: Agent started with URL https://10.129.4.97:8778/jolokia/
+----
 
-=== services
-:svc-name: eventinghello
-include::eventing:partial$knative-objects.adoc[tag=knative-event-services]
 
 [#eventing-cleanup]
 == Cleanup
@@ -201,8 +206,8 @@ kn service delete -n {tutorial-namespace} eventinghello
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kubectl -n {tutorial-namespace} delete -f eventinghello-source.yaml
-kubectl -n {tutorial-namespace} delete -f eventing-hello-sink.yaml
+{kubernetes-cli} -n {tutorial-namespace} delete -f pass:[${TUTORIAL_HOME}]/eventing/eventinghello-source.yaml
+{kubernetes-cli} -n {tutorial-namespace} delete -f pass:[${TUTORIAL_HOME}]/eventing/eventing-hello-sink.yaml
 ----
 --
 ====

documentation/modules/serving/examples/serving/greeter-v1-service.yaml

@@ -9,9 +9,9 @@ spec:
     spec:
       containers:
         - image: quay.io/rhdevelopers/knative-tutorial-greeter:quarkus
-          livenessProbe:
-            httpGet:
-              path: /healthz
-          readinessProbe:
-            httpGet:
-              path: /healthz
+          # livenessProbe:
+          #   httpGet:
+          #     path: /healthz
+          # readinessProbe:
+          #   httpGet:
+          #     path: /healthz

documentation/modules/serving/examples/serving/greeter-v2-service.yaml

@@ -12,9 +12,9 @@ spec:
           env:
             - name: MESSAGE_PREFIX
               value: Namaste
-          livenessProbe:
-            httpGet:
-              path: /healthz
-          readinessProbe:
-            httpGet:
-              path: /healthz
+          # livenessProbe:
+          #   httpGet:
+          #     path: /healthz
+          # readinessProbe:
+          #   httpGet:
+          #     path: /healthz

documentation/modules/serving/examples/serving/service-pinned.yaml

@@ -10,12 +10,12 @@ spec:
           env:
             - name: MESSAGE_PREFIX
               value: Namaste
-          livenessProbe:
-            httpGet:
-              path: /healthz
-          readinessProbe:
-            httpGet:
-              path: /healthz
+          # livenessProbe:
+          #   httpGet:
+          #     path: /healthz
+          # readinessProbe:
+          #   httpGet:
+          #     path: /healthz
   traffic:
     - tag: v1
       revisionName: greeter-v1

documentation/modules/serving/pages/_partials/deploy-knative-resources.adoc

@@ -46,40 +46,34 @@ kn service update greeter \
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service update greeter --tag="greeter-v1=v1"
+kn service update greeter --tag greeter-v1=v1
 ----
 .Tag Revision v2
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service update greeter --tag="greeter-v2=v2"
+kn service update greeter --tag greeter-v2=v2
 ----
 
 .Tag Revision latest
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service update greeter --tag="@latest=latest"
+kn service update greeter --tag @latest=latest
 ----
 
 .Route all traffic to v1
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service update greeter \
-  --traffic="v1=100" \
-  --traffic="v2=0"  \
-  --traffic="latest=0"
+kn service update greeter --traffic v1=100,v2=0,latest=0
 ----
 #end::td-pinned[]
 #tag::td-canary[]
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service update greeter \
-  --traffic="v1=80" \
-  --traffic="v2=20"  \
-  --traffic="latest=0"
+kn service update greeter --traffic v1=80,v2=20,latest=0
 ----
 #end::td-canary[]
 #tag::scaling-10[]
@@ -95,7 +89,7 @@ kn service create prime-generator \
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-kn service create prime-generator \
+kn service update prime-generator \
   --concurrency-target=10 \
   --scale-min=2 \
   --image=quay.io/rhdevelopers/prime-generator:v27-quarkus
@@ -109,7 +103,7 @@ kn service create prime-generator \
 [.console-input]
 [source,bash,subs="+macros,+attributes"]
 ----
-{kubernetes-cli} apply -n {tutorial-namespace} -f link:{github-repo}/{basics-repo}/knative/{service-file}[{service-file}]
+{kubernetes-cli} apply -n tutorial-namespace} -f link:{github-repo}/{basics-repo}/{service-file}[pass:[${TUTORIAL_HOME}]/{basics-repo}/{service-file}]
 ----
 --
 ====