fix(plugins/plugin-kubectl): Quickstart and Hello World Service Guidebooks

Author: mra-ruiz

plugins/plugin-kubectl/notebooks/install-knative-quickstart.md

@@ -5,29 +5,13 @@ layout:
     default: wizard
 wizard:
     steps:
-        - match: Install Knative using quickstart
-          name: Install required tools
-        - match: Install the Knative quickstart plugin
-          name: Install and use the Knative quickstart plugin
+        - name: Install required tools
+        - name: Install the Knative quickstart plugin
           description: The plugin sets up Knative against kind by creating a kind cluster populated with Knative
         - Run the Knative quickstart plugin
+        - Clean Up
 codeblocks:
-    - match: ^brew install kn$
-      validate: kn version
-    - match: ^brew upgrade kn$
-      optional: true
-    - match: ^mv <path-to-binary-file> kn
-      validate: kn version
-    - match: ^mv kn /usr/local/bin$
-      validate: kn version
-    - match: ^git clone https://github.com/knative/client.git
-      validate: $? -e 0 && exit 0 || exit 1
-    - match: ^hack/build.sh -f$
-      validate: $? -e 0 && exit 0 || exit 1
-    - match: ^kn version$
-      validate: $body
-    - match: ^docker run --rm -v "$HOME/.kube/config:/root/.kube/config" gcr.io/knative-releases/knative.dev/client/cmd/kn:latest service list$
-      validate: $? -e 0 && exit 0 || exit 1
+    # validation for step 2: install the knative quickstart plugin
     - match: ^brew install knative-sandbox/kn-plugins/quickstart$
       validate: kn quickstart --help
     - match: ^brew upgrade knative-sandbox/kn-plugins/quickstart$
@@ -40,20 +24,20 @@ codeblocks:
       validate: $? -e 0 && exit 0 || exit 1
     - match: ^mv kn-quickstart /usr/local/bin$
       validate: kn quickstart --help
+    # validation for step 3: Run the knative quickstart plugin
     - match: ^kn quickstart kind$
       validate: (kubectl cluster-info --context kind-knative) && exit 0 || exit 1
     - match: ^kn quickstart minikube$
       validate: minikube profile list
     - match: ^minikube tunnel --profile knative$
       validate: $? -e 0 && exit 0 || exit 1
+    # Validation for Step 4: Clean Up
+    - match: ^kubectl delete --filename service.yaml$
+    - match : ^kn service delete helloworld-go$
+    - match: ^kind delete clusters knative$
+      validate: (kubectl cluster-info --context kind-knative) && exit 1 \|\| exit 0
+    - match: ^minikube delete -p knative$
+      validate: (kubectl cluster-info --context kind-knative) && exit 1 \|\| exit 0
 ---
 
---8<-- "https://raw.githubusercontent.com/kubernetes-sigs/kui/master/plugins/plugin-kubectl/notebooks/knative-what-is-it-good-for.md"
-
----
-
---8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/docs/getting-started/README.md"
-
----
-
---8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/docs/getting-started/quickstart-install.md"
+--8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/docs/guidebooks/install-knative-quickstart.md"

plugins/plugin-kubectl/notebooks/installing-serving-with-yaml.md

@@ -10,33 +10,13 @@ wizard:
         - match: Hello World - Go
           name: Building your application
           description: In this example, you will build a "Hello world" application
-        - match: Deploying
-          name: Deploying your service
+        - name: Deploying
           description: After build is complete, push container to docker hub and then deploy your app into your cluster
         - match: Verifying
           name: Ping your Knative Service
         - match: Removing
           name: Clean Up
 codeblocks:
-    # Validation for Knative CLI under step 1 Required Tools
-    - match: ^(kn version >& /dev/null) && echo "You have the Knative CLI" \|\| (echo "Please install the Knative CLI" && exit 1)$
-      validate: $body
-    - match: ^brew install kn$
-      validate: kn version
-    - match: ^brew upgrade kn$
-      optional: true
-    - match: ^mv <path-to-binary-file> kn
-      validate: kn version
-    - match: ^mv kn /usr/local/bin$
-      validate: kn version
-    - match: ^git clone https://github.com/knative/client.git
-      validate: $? -e 0 && exit 0 \|\| exit 1
-    - match: ^hack/build.sh -f$
-      validate: $? -e 0 && exit 0 \|\| exit 1
-    - match: ^kn version$
-      validate: $body
-    - match: ^docker run --rm -v "$HOME/.kube/config:/root/.kube/config" gcr.io/knative-releases/knative.dev/client/cmd/kn:latest service list$
-      validate: $? -e 0 && exit 0 \|\| exit 1
     # Validation for Step 2: Building your application
     - match: ^git clone https://github.com/knative/docs.git knative-docs
       validation: $? -e 0 && exit 0 \|\| exit 1
@@ -67,25 +47,4 @@ codeblocks:
       validate: (kubectl cluster-info --context kind-knative) && exit 1 \|\| exit 0
 ---
 
---8<-- "https://raw.githubusercontent.com/kubernetes-sigs/kui/master/plugins/plugin-kubectl/notebooks/knative-what-is-it-good-for.md"
-
----
-
-# Knative Serving - Deploying "Hello World"
-
-This application will be deplyoyed as a Knative Service instead of a Kubernetes service.
-
----
-
-# Install Required Tools
-
-!!! note "Note - Installing Knative" 
-    If you install Knative using Quickstart, when you run the quickstart plugin, a cluster called `knative` will be created. To complete the deployment of the "Hello World" application, a pre-built app with a container already pushed to Docker hub will be used.
-
---8<-- "knative.md"
-
---8<-- "kn-cli.md"
-
---8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/code-samples/serving/hello-world/helloworld-go/README.md"
-
---8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/docs/getting-started/clean-up.md"
+--8<-- "https://raw.githubusercontent.com/mra-ruiz/docs/guidebooks/docs/guidebooks/knative-serving-hello-world.md"

plugins/plugin-kubectl/notebooks/kn-cli.md

@@ -77,7 +77,6 @@ export default async (registrar: PreloadRegistrar) => {
       'plugin://plugin-kubectl/notebooks/knative-what-is-it-good-for.md',
       'plugin://plugin-kubectl/notebooks/install-knative-quickstart.md',
       'plugin://plugin-kubectl/notebooks/knative-quickstart.json',
-      'plugin://plugin-kubectl/notebooks/knative-first-service.md',
       'plugin://plugin-kubectl/notebooks/knative-first-autoscale.md',
       'plugin://plugin-kubectl/notebooks/knative-traffic-splitting.md',
       'plugin://plugin-kubectl/notebooks/knative-introducing-eventing.md',