more updates

Signed-off-by: Doug Davis <[email protected]>

Author: Doug Davis

README.md

@@ -15,21 +15,17 @@ Why? Couple of reasons:
 
 ## Faking it
 
-If you don't want to actually run through the demo yourself but you'd still
-like to see what it looks like when you run it, simply clone this repo and
-run:
+If you don't have an IKS cluster, don't have good internet connectivity,
+or for whatever reason just don't want to actually execute all of the steps
+of the demo but you'd still like to see what the demo looks like, simple run:
 ```bash
 $ USESAVED=1 ./demo
 ```
-
 The demo will pause for each step, just press the spacebar to continue.
 
 This will run the demo code but use the output from a saved run. The output
 will look just like you're running it live.
 
-This is also good for cases where you don't have internet connectivity but
-still want to show it off.
-
 ## Demo Setup
 
 This demo assumes you're using [IBM's Kubernetes Service](cloud.ibm.com/iks)
@@ -51,16 +47,13 @@ No other special setup should be needed, so let's move on to the demo
 
 You can run the demo manually or via the `demo` script.
 
-If you want to use the `demo` script make sure you set the `DOMAIN`
-environment variable to the domain name of your IKS cluster first:
+If you want to use the `demo` script, where it'll do all of the typing
+for you but still execute the commands, just run:
 
 ```bash
-$ export DOMAIN=...
+$ ./demo
 ```
 
-You can get the proper value by looking at the `Ingress Subdomain`
-value in the `ibmcloud bx ks cluster-get CLUSTER` output.
-
 For those who want to run the demo manually, let's walk through each step
 to explain what's going on.
 
@@ -207,7 +200,7 @@ of this new resource will kick off a Tekton execution of the referenced
 `Task`. So, let's do it:
 
 ```bash
-$ kapply task.yaml
+$ ./kapply task.yaml
 task.tekton.dev/build-push created
 taskrun.tekton.dev/build-image created
 ```
@@ -267,7 +260,7 @@ newly created image that's stored in our local Docker Registry.
 Let's create it:
 
 ```bash
-$ kapply service.yaml
+$ ./kapply service.yaml
 service.serving.knative.dev/hello created
 ```
 
@@ -290,11 +283,9 @@ curl -s http://hello-default.kntest.us-south.containers.appdomain.cloud
 All done, so let's clean-up:
 
 ```bash
-$ kubectl delete -f service.yaml
-$ kubectl delete -f hub.yaml
+$ kubectl delete -f service.yaml -f hub.yaml
 ```
 
-
 ## Some Notes
 
 As I mentioned previsously, I picked Docker's Registry for a couple of

demo

@@ -1,23 +1,28 @@
 #!/bin/bash
 
+set -e
+
 source .demoscript
 RETRYONFAIL=1
-export DOMAIN=${DOMAIN:-v06.us-south.containers.appdomain.cloud}
+D=$(bx ks cluster-get $(kubectl config current-context) | grep "Ingress Subdomain" | sed "s/^.*: *\([^ ]*\) *$/\1/" )
+export DOMAIN=${DOMAIN:-$D}
 export PATH=.:$PATH
 
-(
-set +e
-kubectl delete cm/source
-kubectl delete -f hub.yaml -f task.yaml -f service.yaml
-kubectl delete buildtemplate/kaniko
-) &> /dev/null || true
-
-set -e
-
-if ! kubectl get ns tekton-pipelines &> /dev/null ; then
-  comment "Installing Tekton"
-  doit kubectl apply -f \
-      https://storage.googleapis.com/tekton-releases/latest/release.yaml
+comment "Talking to cluster at: ${DOMAIN}"
+
+if [[ -z "${USESAVED}" ]]; then
+  (
+  set +e
+  kubectl delete cm/source
+  kubectl delete -f hub.yaml -f task.yaml -f service.yaml
+  kubectl delete buildtemplate/kaniko
+  ) &> /dev/null || true
+
+  if ! kubectl get ns tekton-pipelines &> /dev/null ; then
+    comment "Installing Tekton"
+    doit kubectl apply -f \
+        https://storage.googleapis.com/tekton-releases/latest/release.yaml
+  fi
 fi
 
 comment "Create a configMap to hold the source code of the 'hello' app"
@@ -27,7 +32,11 @@ comment "Create the Docker Registry Knative Service"
 scroll hub.yaml
 doit kubectl apply -f hub.yaml
 
+comment "Wait for the hub to be ready..."
+wait curl -fq http://hub-default.$DOMAIN
+
 comment "Create the build 'task' and 'taskrun' - basically, do the build"
+scroll task.yaml
 doit kapply task.yaml
 
 comment "Wait for the build to finish..."
@@ -36,18 +45,19 @@ doit --untilgrep=True  kubectl get taskrun/build-image
 comment "Delete the build artifacts"
 doit kubectl delete cm/source
 doit kubectl delete -f task.yaml
-doit --ignorerc "kubectl delete buildtemplate/kaniko &> /dev/null"
+# doit --ignorerc "kubectl delete buildtemplate/kaniko &> /dev/null"
 
 comment "Create the 'hello' Knative Service using the image"
+scroll service.yaml
 doit kapply service.yaml
 
 comment "Wait for the Service to be ready..."
-doit --norepaint --untilgrep=True  kubectl get ksvc/hello
+doit --norepaint --pausetime=2 --untilgrep=True  kubectl get ksvc/hello
 
 comment "Curl/test it"
 doit --norepaint --untilgrep=Hello curl -s http://hello-default.$DOMAIN
 
 comment "Clean up"
-doit kubectl delete -f service.yaml
-doit kubectl delete -f hub.yaml
+doit kubectl delete -f service.yaml -f hub.yaml
+
 rm cmds

demo.tar

@@ -42,7 +42,7 @@ while [[ -n "${1}" ]]; do
                 fi
             else
                 # var == env var name
-                if [[ "${!var}" == "" ]]; then
+                if [[ "${!var}" == "" && -e .env ]]; then
                     var=$(cat .env | grep "^${var}=" | sed "s/^[^=]*=//")
                 else
                     var=${!var}