Update workshop

Signed-off-by: ashish <[email protected]>

Author: Revolyssup

lab-1/README.md

@@ -24,10 +24,16 @@ Using Meshery, select Istio from the `Management` menu.
 In the Istio management page:
 
 1. Type `istio-system` into the namespace field.
-1. Click the (+) icon on the `Install` card and select `Latest Istio` to install the latest version of Istio.
+2. Click the (+) icon on the `Install` card and click on `Istio Service Mesh` to install latest version of Istio.
 
-   <a href="img/install-istio.png">
-   <img src="img/install-istio.png" width="50%" align="center" />
+   <a href="img/install-istio1.png">
+   <img src="img/install-istio1.png" width="50%" align="center" />
+   </a>
+
+3. Click the `Deploy` button on the confirmation modal.
+
+   <a href="img/install-istio2.png">
+   <img src="img/install-istio2.png" width="50%" align="center" />
    </a>
 
 <h2>

lab-1/img/install-istio1.png

@@ -48,6 +48,14 @@ Output:
 NAME                     DATA   AGE
 istio-sidecar-injector   2      9h
 ```
+#### Enable automatic sidecar injection
+Using Meshery, navigate to the Istio management page. 
+1. Enter `default` in the namespace field. 
+2. Then click on `+` under `Apply Service Mesh Configuration` and click on `Automatic Sidecar injection`
+<a href="img/sidecar-injection.png">
+<img src="img/sidecar-injection.png" width="50%" align="center" />
+</a>
+
 
 NamespaceSelector decides whether to run the webhook on an object based on whether the namespace for that object matches the [selector](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors).
 
@@ -65,14 +73,15 @@ kube-public    Active    1h
 kube-system    Active    1h
 ```
 
+
+
 Using Meshery, navigate to the Istio management page.
 
 1. Enter `default` in the `Namespace` field.
 1. Click the (+) icon on the `Sample Application` card and select `BookInfo Application` from the list.
 
-This will do 3 things:
+This will do 2 things:
 
-1. Label `default` namespace for sidecar injection.
 1. Deploys all the BookInfo services in the `default` namespace.
 1. Deploys the virtual service and gateway needed to expose the BookInfo's productpage application in the `default` namespace.
 

lab-1/img/install-istio2.png

@@ -0,0 +1,61 @@
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: productpage
+spec:
+  host: productpage
+  subsets:
+    - name: v1
+      labels:
+        version: v1
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: reviews
+spec:
+  host: reviews
+  subsets:
+    - name: v1
+      labels:
+        version: v1
+    - name: v2
+      labels:
+        version: v2
+    - name: v3
+      labels:
+        version: v3
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: ratings
+spec:
+  host: ratings
+  subsets:
+    - name: v1
+      labels:
+        version: v1
+    - name: v2
+      labels:
+        version: v2
+    - name: v2-mysql
+      labels:
+        version: v2-mysql
+    - name: v2-mysql-vm
+      labels:
+        version: v2-mysql-vm
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: DestinationRule
+metadata:
+  name: details
+spec:
+  host: details
+  subsets:
+    - name: v1
+      labels:
+        version: v1
+    - name: v2
+      labels:
+        version: v2

lab-2/README.md

@@ -19,7 +19,7 @@ kubectl get pods -n istio-system
 Copy and paste your ingress gateway's pod name. Execute:
 
 ```sh
-kubectl -n istio-system exec -it <istio-ingressgateway-...> bash
+kubectl -n istio-system exec -it <istio-ingressgateway-...> -- bash
 ```
 
 You can view the statistics, listeners, routes, clusters and server info for the Envoy proxy by forwarding the local port:

lab-2/img/sidecar-injection.png

@@ -2,14 +2,13 @@
 
 You will need each of the following in order to complete the workshop:
 
-1. Docker (installed locally)
 1. Kubernetes (installed locally or have remote access to a cluster)
 1. Meshery (installed locally)
 1. Istioctl (installed locally)
 
-## Install Docker and Create a Kubernetes Cluster<a name="1"></a>
+## Create a Kubernetes Cluster<a name="1"></a>
 
-You will access to a Kubernetes cluster in this training. While any Kubernetes cluster _should_ work, instructions for Docker Desktop and Minikube are included in these labs as the example Kubernetes platforms. Alternatively, you may choose to use any of the other [supported Kubernetes platform](https://github.com/layer5io/meshery#run-meshery).
+You will need  access to a Kubernetes cluster in this training. While any Kubernetes cluster _should_ work, instructions for Docker Desktop and Minikube are included in these labs as the example Kubernetes platforms. Alternatively, you may choose to use any of the other [supported Kubernetes platform](https://github.com/layer5io/meshery#run-meshery).
 
 ### Setup Docker Desktop (MacOS and Windows)
 
@@ -56,24 +55,16 @@ If all pods are in a `Running` state, you have an operational Kubernetes cluster
 ## Download `mesheryctl`<a name="3"></a>
 
 ### Meshery Architecture
-In this workshop, Meshery will run "off-cluster", which is to say it will be running outside of the Kubernetes cluster. You will be running Meshery in your local Docker instance. 
+In this workshop, Meshery and Istio adapter for Meshery will be running in-cluster in the `meshery` namespace.
 
 <img src="img/meshery-architecture.svg" alt="Meshery Architecture" style="float: left; margin-right: 10px;" width="60%" />
 
- Install Meshery on your local machine (running Docker) by executing the following:
 
-#### Install on MacOS with Homebrew
 
+#### Install on MacOS and Linux with bash script:
+The below command installs Meshery and Istio adapter for Meshery in `meshery` namespace in your cluster.
 ```
-brew tap layer5io/tap
-brew install mesheryctl
-mesheryctl system start
-```
-
-#### Or... Install on MacOS and Linux with bash script:
-
-```
-curl -L https://git.io/meshery | bash -
+curl -L https://meshery.io/install | ADAPTERS=istio PLATFORM=kubernetes bash -
 ```
 
 #### Or.... Install on Windows with `mesheryctl` binary