diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/adapter-up.png b/Meshery-Adapters/kuma-meshery-adapter/assets/adapter-up.png deleted file mode 100644 index f10f651..0000000 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/adapter-up.png and /dev/null differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/cluster-up.png b/Meshery-Adapters/kuma-meshery-adapter/assets/cluster-up.png deleted file mode 100644 index 0670cfd..0000000 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/cluster-up.png and /dev/null differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/install image-hub.png b/Meshery-Adapters/kuma-meshery-adapter/assets/install image-hub.png new file mode 100644 index 0000000..991f85a Binary files /dev/null and b/Meshery-Adapters/kuma-meshery-adapter/assets/install image-hub.png differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/install-kuma.png b/Meshery-Adapters/kuma-meshery-adapter/assets/install-kuma.png index 6832a1a..12adb6a 100644 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/install-kuma.png and b/Meshery-Adapters/kuma-meshery-adapter/assets/install-kuma.png differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-adapter.png b/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-adapter.png index 4de1c19..0b31785 100644 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-adapter.png and b/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-adapter.png differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-connected.png b/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-connected.png new file mode 100644 index 0000000..8f4a418 Binary files /dev/null and b/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-connected.png differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-sample-app.png b/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-sample-app.png deleted file mode 100644 index 118195b..0000000 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/kuma-sample-app.png and /dev/null differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/meshery-none-provider.png b/Meshery-Adapters/kuma-meshery-adapter/assets/meshery-none-provider.png deleted file mode 100644 index befa9cf..0000000 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/meshery-none-provider.png and /dev/null differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/server-page.png b/Meshery-Adapters/kuma-meshery-adapter/assets/server-page.png deleted file mode 100644 index 7cf130c..0000000 Binary files a/Meshery-Adapters/kuma-meshery-adapter/assets/server-page.png and /dev/null differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/assets/starting-page.png b/Meshery-Adapters/kuma-meshery-adapter/assets/starting-page.png new file mode 100644 index 0000000..b9167ed Binary files /dev/null and b/Meshery-Adapters/kuma-meshery-adapter/assets/starting-page.png differ diff --git a/Meshery-Adapters/kuma-meshery-adapter/index.json b/Meshery-Adapters/kuma-meshery-adapter/index.json index 78ec085..60c8e68 100644 --- a/Meshery-Adapters/kuma-meshery-adapter/index.json +++ b/Meshery-Adapters/kuma-meshery-adapter/index.json @@ -38,11 +38,11 @@ "hideHiddenFiles": true, "exclusionPatterns": ["*test", "./test/*", "./logs"], "showdashboard": true, - "dashboards": [{"name": "Meshery Server", "port": 9081}], + "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Image Hub", "port": 8080}], "uilayout": "terminal-iframe" }, "backend": { - "imageid": "kubernetes-cluster-running:1.18" + "imageid": "kubernetes-cluster-running:1.22" } } \ No newline at end of file diff --git a/Meshery-Adapters/kuma-meshery-adapter/step1.md b/Meshery-Adapters/kuma-meshery-adapter/step1.md index da3b3d7..48151ac 100644 --- a/Meshery-Adapters/kuma-meshery-adapter/step1.md +++ b/Meshery-Adapters/kuma-meshery-adapter/step1.md @@ -10,20 +10,28 @@ Meshery can be downloaded, installed, and launched with a single command: `curl -L https://git.io/meshery | ADAPTERS=kuma PLATFORM=kubernetes bash -`{{execute}} -**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Linkerd. +**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Kuma. Meshery is now available at host:`9081`. -Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/ +>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. -- Click on the **Meshery UI** tab -- Click on **Display Port** +To know that the Meshery has loaded with all the components connected, run + +`mesheryctl system status`{{execute}}. + + If all the components are in ready state you can open Mehsery UI tab with everything connected. + +Find the **Meshery UI** tab which is configured to be listening at `http://localhost:9081`/ + +- Click on new tab icon the **Meshery UI** tab +- Click on **Display Port** **Welcome to Meshery!** Choose **Meshery** as your provider. Sign in to get started. -![Meshery landing page](./assets/meshery-none-provider.png) +![Meshery landing page](./assets/starting-page.png) ## Connect your cluster with Meshery @@ -34,8 +42,6 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i 1. Between Meshery and Kubernetes. -![Meshery connected with cluster](./assets/cluster-up.png) - -1. Between Meshery and the Meshery Adapter for your corresponding service mesh. +2. Between Meshery and the Meshery Adapter for your corresponding service mesh. -![Meshery connected with adapter](./assets/adapter-up.png) +![Meshery connected with adapter](./assets/kuma-connected.png) diff --git a/Meshery-Adapters/kuma-meshery-adapter/step2.md b/Meshery-Adapters/kuma-meshery-adapter/step2.md index 783afa5..e6b4fbe 100644 --- a/Meshery-Adapters/kuma-meshery-adapter/step2.md +++ b/Meshery-Adapters/kuma-meshery-adapter/step2.md @@ -1,17 +1,17 @@ Kuma can be installed on Meshery with one click! -## 1. Select `Kuma` from the Management menu +## 1. Select `Kuma` from the Lifecycle menu ![Meshery adapter for Kuma](./assets/kuma-adapter.png) ## 2. In the Kuma management page: - Type `kuma` into the namespace field -- Click the (+) icon on the Install card and select `Latest Kuma` to install the latest version of Istio +- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Kuma Service Mesh` to install the latest version of Kuma ![Install Kuma using Meshery](./assets/install-kuma.png) -To check if Istio is along with all the pieces that have been deployed, execute the following: +To check if Kuma is along with all the pieces that have been deployed, execute the following: `kubectl get all -n kuma-system`{{execute}} diff --git a/Meshery-Adapters/kuma-meshery-adapter/step3.md b/Meshery-Adapters/kuma-meshery-adapter/step3.md index 9ed7ac1..a538163 100644 --- a/Meshery-Adapters/kuma-meshery-adapter/step3.md +++ b/Meshery-Adapters/kuma-meshery-adapter/step3.md @@ -7,20 +7,12 @@ Sample Applications are deployed on top of a service mesh to help you explore an ## Deploy Image Hub on Kuma - Navigate to the **Kuma Management** page on Meshery with `default` in the Namespace field. -- Select the `Image Hub application` in the `Sample Application` drop down menu. +- Select the `Image Hub application` in the `Manage Sample Application Life` drop down menu. -![Kuma Imagehub](./assets/kuma-sample-app.png) +![Kuma Imagehub](./assets/install image-hub.png) You will be notified of successful deployment. -## Expose your Sample Application - -A sidecar injector is used for automating the injection of the Linkerd proxy into your application's pod spec. The Kubernetes admission controller enforces this behavior by sending a webhook request to the sidecar injector every time a pod is to be scheduled. - -You have already deployed the sidecar proxy injector when you installed Consul, which should be running in your control plane. To verify, execute this command: - -`kubectl get deployment consul-consul-connect-injector-webhook-deployment -n consul-system`{{execute}} - **Let's verify that your deployment works. Run**: (The *Available* column might take upto a minute to get updated) @@ -30,9 +22,8 @@ Sample Output: | NAME | READY | UP-TO-DATE | AVAILABLE | AGE | |:-----------------:|:-----:|:----------:|:---------:|:---:| -| api-deployment-v1 | 1/1 | 1 | 1 | 88s | -| envoy | 1/1 | 1 | 1 | 88s | -| web-deployment | 1/1 | 1 | 1 | 88s | +| api-v1 | 1/1 | 1 | 1 | 88s | +| web-v1 | 1/1 | 1 | 1 | 88s | ### Let's inspect our pod: @@ -50,10 +41,10 @@ If you cannot see the *Ready* column updated, this is because the deployment can `kubectl get svc -n default`{{execute}} - `kubectl describe svc/web-service -n default`{{execute}} + `kubectl describe svc/web -n default`{{execute}} 4. Assess the application deployment by port-forwarding the web-service service: - `kubectl port-forward svc/web-service 8080 --address 0.0.0.0 -n default`{{Execute}} + `kubectl port-forward svc/web 8080 --address 0.0.0.0 -n default`{{Execute}} The Image Hub application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080` diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/adapter-up.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/adapter-up.png deleted file mode 100644 index f10f651..0000000 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/adapter-up.png and /dev/null differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/cluster-up.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/cluster-up.png deleted file mode 100644 index 0670cfd..0000000 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/cluster-up.png and /dev/null differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-dep.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-dep.png new file mode 100644 index 0000000..f8755ac Binary files /dev/null and b/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-dep.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-deployed.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-deployed.png deleted file mode 100644 index c969cd7..0000000 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/emojivoto-deployed.png and /dev/null differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/install-linkerd.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/install-linkerd.png index a87b90e..0e64cd0 100644 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/install-linkerd.png and b/Meshery-Adapters/linkerd-meshery-adapter/assets/install-linkerd.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-adapter.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-adapter.png index 71e250d..3f85ec5 100644 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-adapter.png and b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-adapter.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-connected.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-connected.png new file mode 100644 index 0000000..a75f7fa Binary files /dev/null and b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-connected.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-installed.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-installed.png index 8372e91..1426c28 100644 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-installed.png and b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-installed.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-sample-app.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-sample-app.png index e599a92..d03f256 100644 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-sample-app.png and b/Meshery-Adapters/linkerd-meshery-adapter/assets/linkerd-sample-app.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/meshery-none-provider.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/meshery-none-provider.png deleted file mode 100644 index befa9cf..0000000 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/meshery-none-provider.png and /dev/null differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/server-page.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/server-page.png deleted file mode 100644 index 7cf130c..0000000 Binary files a/Meshery-Adapters/linkerd-meshery-adapter/assets/server-page.png and /dev/null differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/assets/starting-page.png b/Meshery-Adapters/linkerd-meshery-adapter/assets/starting-page.png new file mode 100644 index 0000000..b9167ed Binary files /dev/null and b/Meshery-Adapters/linkerd-meshery-adapter/assets/starting-page.png differ diff --git a/Meshery-Adapters/linkerd-meshery-adapter/index.json b/Meshery-Adapters/linkerd-meshery-adapter/index.json index eb587e1..d1a2d00 100644 --- a/Meshery-Adapters/linkerd-meshery-adapter/index.json +++ b/Meshery-Adapters/linkerd-meshery-adapter/index.json @@ -37,11 +37,11 @@ "hideHiddenFiles": true, "exclusionPatterns": ["*test", "./test/*", "./logs"], "showdashboard": true, - "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Emojivoto", "port": 8080}], + "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Emojivoto", "port": 80}], "uilayout": "terminal-iframe" }, "backend": { - "imageid": "kubernetes-cluster-running:1.18" + "imageid": "kubernetes-cluster-running:1.22" } } \ No newline at end of file diff --git a/Meshery-Adapters/linkerd-meshery-adapter/step1.md b/Meshery-Adapters/linkerd-meshery-adapter/step1.md index a2cbbda..3af8293 100644 --- a/Meshery-Adapters/linkerd-meshery-adapter/step1.md +++ b/Meshery-Adapters/linkerd-meshery-adapter/step1.md @@ -14,18 +14,26 @@ Meshery can be downloaded, installed, and launched with a single command: Meshery is now available at host:`9081`. +>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. + +To know that the Meshery has loaded with all the components connected, run + +`mesheryctl system status`{{execute}}. + +If all the components are in ready state you can open Mehsery UI tab with everything connected. + ## Open Meshery UI Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/ -- Click on the **Meshery UI** tab +- Click on new tab icon the **Meshery UI** tab - Click on **Display Port** **Welcome to Meshery!** Choose **Meshery** as your provider. Sign in to get started. -![Meshery landing page](./assets/meshery-none-provider.png) +![Meshery landing page](./assets/starting-page.png) ## Connect your cluster with Meshery @@ -36,4 +44,4 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i 1. Between Meshery and Kubernetes. 2. Between Meshery and the Meshery Adapter for your corresponding service mesh. -![Meshery connected with cluster](./assets/cluster-up.png) +![Meshery connected with cluster](./assets/linkerd-connected.png) diff --git a/Meshery-Adapters/linkerd-meshery-adapter/step2.md b/Meshery-Adapters/linkerd-meshery-adapter/step2.md index 7bf21c0..89f0a16 100644 --- a/Meshery-Adapters/linkerd-meshery-adapter/step2.md +++ b/Meshery-Adapters/linkerd-meshery-adapter/step2.md @@ -1,19 +1,21 @@ Linkerd can be installed on Meshery with one click! -## 1. Select `Linkerd` from the Management menu +## 1. Select `Linkerd` from the Lifecycle menu ![Meshery adapter for Linkerd](./assets/linkerd-adapter.png) ## 2. In the Linkerd management page: -- Type `linkerd-system` into the namespace field -- Click the (+) icon on the Install card and select `Latest Linkerd` to install the latest version of Istio +- Type `linkerd-system` into the namespace field. +- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Linkerd Service Mesh` to install the latest version of Linkerd ![Install Linkerd using Meshery](./assets/install-linkerd.png) You can verify the successful installation of Linkerd on your Meshery instance by running: `kubectl get all -n linkerd-system`{{execute}} +You can continue to next step after all the components displayed on the terminal after running this command, are in ready state. The same can be seen on your Meshery dashboard: -![Linkerd deployed](./assets/linkerd-installed.png) \ No newline at end of file +![Linkerd deployed](./assets/linkerd-installed.png) + diff --git a/Meshery-Adapters/linkerd-meshery-adapter/step3.md b/Meshery-Adapters/linkerd-meshery-adapter/step3.md index 9843572..eaaaf24 100644 --- a/Meshery-Adapters/linkerd-meshery-adapter/step3.md +++ b/Meshery-Adapters/linkerd-meshery-adapter/step3.md @@ -23,13 +23,13 @@ Upon successful deployment, the output should look like: To deploy the Emojivoto application, follow these steps: - - Using Meshery, navigate to the Linkerd management page. + - Using Meshery, navigate to the Linkerd management page from the Lifecycle menu. - Enter `default` in the Namespace field. This is the namespace in which we will be defining and deploying the Sample Application. - - Click the (+) icon on the Sample Application card and select `Emojivoto Application` from the list. + - Click the (+) icon on the Manage Sample Application Lifecycle card and select `EmojiVoto Application` from the list. ![Emojivoto sample app](./assets/linkerd-sample-app.png) - ![Emojivoto deployed](./assets/emojivoto-deployed.png) + ![Emojivoto deployed](./assets/emojivoto-dep.png) **Let's verify that your deployment works. Run**: @@ -46,12 +46,13 @@ Sample Output: | web | 1/1 | 1 | 1 | 4m38s | ### Let's inspect our pod: +If you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When all the deployment are in ready state, you can use `CTRL + C` or `CMD + C` to switch back to the terminal. 1. View the details of the deployed pods: `watch kubectl get po -n default`{{execute}} -If you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When the deployment is complete, the page will auto-refresh. You can use `CTRL+ C` to switch back to the terminal. +Again if you cannot see the *Ready* column updated, this is because the deployment can take up upto a minute. When the deployment is complete, the page will auto-refresh. You can use `CTRL+ C` or `CMD + C` to switch back to the terminal. 2. View the details of the services: @@ -68,11 +69,11 @@ If you cannot see the *Ready* column updated, this is because the deployment can `kubectl port-forward svc/web-svc 80:80 --address 0.0.0.0 -n default`{{Execute}} **Success!** -The `emojivoto` sample application has now been onboarded on to your Linkerd instance. As a final check, let's verify your data plane environment with this check: +The `emojivoto` sample application has now been onboarded on to your Linkerd instance. This may take some time. As a final check, let's verify your data plane environment with this check: `linkerd -n emojivoto check --proxy`{{execute}} -The Emojivoto sample application should now be deployed at HTTP port:`8080`. Make your way to the `Linkerd-Emojivoto` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080` +The Emojivoto sample application should now be deployed at HTTP port:`80`. Make your way to the `Emojivoto` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:80` **Note**: The Sample Application may take upto a minute to deploy. Please be patient diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/adapter-up.png b/Meshery-Adapters/nsm-meshery-adapter/assets/adapter-up.png deleted file mode 100644 index f10f651..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/adapter-up.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/cluster-up.png b/Meshery-Adapters/nsm-meshery-adapter/assets/cluster-up.png deleted file mode 100644 index 0670cfd..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/cluster-up.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-deployed.png b/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-deployed.png deleted file mode 100644 index 9269291..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-deployed.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-instaled.png b/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-instaled.png new file mode 100644 index 0000000..14f0e6f Binary files /dev/null and b/Meshery-Adapters/nsm-meshery-adapter/assets/icmp-instaled.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/install-nsm.png b/Meshery-Adapters/nsm-meshery-adapter/assets/install-nsm.png index 0fe209d..0f75ffc 100644 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/install-nsm.png and b/Meshery-Adapters/nsm-meshery-adapter/assets/install-nsm.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-none-provider.png b/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-none-provider.png deleted file mode 100644 index befa9cf..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-none-provider.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-provider.png b/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-provider.png deleted file mode 100644 index 7cf130c..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/meshery-provider.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-adapter.png b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-adapter.png index 2e2286e..8dd44fe 100644 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-adapter.png and b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-adapter.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-connected.png b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-connected.png new file mode 100644 index 0000000..2005a41 Binary files /dev/null and b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-connected.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-installed.png b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-installed.png index f8cf18f..60dd6a3 100644 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-installed.png and b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-installed.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-app.png b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-app.png deleted file mode 100644 index 805df26..0000000 Binary files a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-app.png and /dev/null differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-application.png b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-application.png new file mode 100644 index 0000000..c09de3c Binary files /dev/null and b/Meshery-Adapters/nsm-meshery-adapter/assets/nsm-sample-application.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/assets/starting-page.png b/Meshery-Adapters/nsm-meshery-adapter/assets/starting-page.png new file mode 100644 index 0000000..b9167ed Binary files /dev/null and b/Meshery-Adapters/nsm-meshery-adapter/assets/starting-page.png differ diff --git a/Meshery-Adapters/nsm-meshery-adapter/index.json b/Meshery-Adapters/nsm-meshery-adapter/index.json index b370f79..de170bf 100644 --- a/Meshery-Adapters/nsm-meshery-adapter/index.json +++ b/Meshery-Adapters/nsm-meshery-adapter/index.json @@ -37,10 +37,10 @@ "hideHiddenFiles": true, "exclusionPatterns": ["*test", "./test/*", "./logs"], "showdashboard": true, - "dashboards": [{"name": "Meshery Server", "port": 9081},{"name": "ICMP", "port": 8080}], + "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "ICMP", "port": 8080}], "uilayout": "terminal-iframe" }, "backend": { - "imageid": "kubernetes-cluster-running:1.18" + "imageid": "kubernetes-cluster-running:1.22" } } \ No newline at end of file diff --git a/Meshery-Adapters/nsm-meshery-adapter/step1.md b/Meshery-Adapters/nsm-meshery-adapter/step1.md index 245ab35..b4fb170 100644 --- a/Meshery-Adapters/nsm-meshery-adapter/step1.md +++ b/Meshery-Adapters/nsm-meshery-adapter/step1.md @@ -10,20 +10,28 @@ Meshery can be downloaded, installed, and launched with a single command: `curl -L https://git.io/meshery | ADAPTERS=nsm PLATFORM=kubernetes bash -`{{execute}} -**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for Linkerd. +**Congratulations!** You have successfully installed Meshery and the Meshery Adapter for NSM. Meshery is now available at host:`9081`. +>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. + +To know that the Meshery has loaded with all the components connected, run + +`mesheryctl system status`{{execute}}. + +If all the components are in ready state you can open Mehsery UI tab with everything connected. + Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/ -- Click on the **Meshery UI** tab +- Click on new tab icon the **Meshery UI** tab - Click on **Display Port** **Welcome to Meshery!** Choose **Meshery** as your provider. Sign in to get started. -![Meshery landing page](./assets/meshery-none-provider.png) +![Meshery landing page](./assets/starting-page.png) ## Connect your cluster with Meshery @@ -34,4 +42,4 @@ Meshery will auto-connect with your Kubernetes by loading the kubeconfig found i 1. Between Meshery and Kubernetes. 2. Between Meshery and the Meshery Adapter for your corresponding service mesh. -![Meshery connected with cluster](./assets/cluster-up.png) +![Meshery connected with cluster](./assets/nsm-connected.png) diff --git a/Meshery-Adapters/nsm-meshery-adapter/step2.md b/Meshery-Adapters/nsm-meshery-adapter/step2.md index b6b56c1..0c15d0a 100644 --- a/Meshery-Adapters/nsm-meshery-adapter/step2.md +++ b/Meshery-Adapters/nsm-meshery-adapter/step2.md @@ -4,10 +4,10 @@ Meshery allows you to install any service mesh with a single click: ![Meshery adapter for NSM](./assets/nsm-adapter.png) -## 2. In the Istio management page: +## 2. In the NSM management page: - Type `nsm-system` into the namespace field -- Click the (+) icon on the Install card and select `Network Service Mesh` to install the latest version of Istio +- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `NSM` to install the latest version of NSM ![Install NSM using Meshery](./assets/install-nsm.png) @@ -16,7 +16,9 @@ Meshery allows you to install any service mesh with a single click: NSM has been deployed in a separate Kubernetes namespace: nsm-system. To check if NSM is along with all the pieces that have been deployed, execute the following: `kubectl get all -n nsm-system`{{execute}} +You can continue to next step after all the components displayed on the terminal after running this command, are in ready state. The details of your configuration will also be reflected on the Meshery dashboard: + ![NSM installed](./assets/nsm-installed.png) diff --git a/Meshery-Adapters/nsm-meshery-adapter/step3.md b/Meshery-Adapters/nsm-meshery-adapter/step3.md index f619778..be6a464 100644 --- a/Meshery-Adapters/nsm-meshery-adapter/step3.md +++ b/Meshery-Adapters/nsm-meshery-adapter/step3.md @@ -8,20 +8,20 @@ Sample Applications are deployed on top of a service mesh to help you explore an ## Deploy ICMP Application on Kuma -- Navigate to the **NSM Management** page on Meshery with `default` in the Namespace field. -- Select the `ICMP` in the `Sample Application` drop down menu. +- Navigate to the **NSM Management** page from the Lifecycle Menu on Meshery and select `default` in the Namespace field. +- Select the `ICMP Responded` in the Manage Sample Application Lifecycle drop down menu. ![NSM Sample Apps](./assets/nsm-sample-app.png) You will be notified of successful deployment: -![NSM ICMP](./assets/icmp-deployed.png) +![NSM ICMP](./assets/icmp-instaled.png) ## Expose your Sample Application A sidecar injector is used for automating the injection of the NSM proxy into your application's pod spec. The Kubernetes admission controller enforces this behavior by sending a webhook request to the sidecar injector every time a pod is to be scheduled. -You have already deployed the sidecar proxy injector when you installedsz Consul, which should be running in your control plane. To verify, execute this command: +You have already deployed the sidecar proxy injector when you installed NSM, which should be running in your control plane. To verify, execute this command: `kubectl get deployment nsm-admission-webhook -n nsm-system`{{execute}} @@ -59,4 +59,4 @@ If you cannot see the *Ready* column updated, this is because the deployment can `kubectl port-forward svc/nsm-admission-webhook 8080 --address 0.0.0.0 -n default`{{Execute}} -The Image Hub application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080` \ No newline at end of file +The ICMP application should now be deployed on the HTTP port: `8080`. Make your way to the `ImageHub` Server tab. For this tutorial, the server is configured to be listening at `http://localhost:8080` \ No newline at end of file diff --git a/Meshery-Adapters/osm-meshery-adapter/assets/osm-adapter.png b/Meshery-Adapters/osm-meshery-adapter/assets/osm-adapter.png index a500e89..dbc2e12 100644 Binary files a/Meshery-Adapters/osm-meshery-adapter/assets/osm-adapter.png and b/Meshery-Adapters/osm-meshery-adapter/assets/osm-adapter.png differ diff --git a/Meshery-Adapters/osm-meshery-adapter/assets/osm-connected.png b/Meshery-Adapters/osm-meshery-adapter/assets/osm-connected.png new file mode 100644 index 0000000..e3992f1 Binary files /dev/null and b/Meshery-Adapters/osm-meshery-adapter/assets/osm-connected.png differ diff --git a/Meshery-Adapters/osm-meshery-adapter/assets/osm-sample.png b/Meshery-Adapters/osm-meshery-adapter/assets/osm-sample.png index 8b016cd..11ae6cd 100644 Binary files a/Meshery-Adapters/osm-meshery-adapter/assets/osm-sample.png and b/Meshery-Adapters/osm-meshery-adapter/assets/osm-sample.png differ diff --git a/Meshery-Adapters/osm-meshery-adapter/assets/starting-page.png b/Meshery-Adapters/osm-meshery-adapter/assets/starting-page.png new file mode 100644 index 0000000..b9167ed Binary files /dev/null and b/Meshery-Adapters/osm-meshery-adapter/assets/starting-page.png differ diff --git a/Meshery-Adapters/osm-meshery-adapter/index.json b/Meshery-Adapters/osm-meshery-adapter/index.json index ef765ea..a5fb0ee 100644 --- a/Meshery-Adapters/osm-meshery-adapter/index.json +++ b/Meshery-Adapters/osm-meshery-adapter/index.json @@ -36,11 +36,11 @@ "hideHiddenFiles": true, "exclusionPatterns": ["*test", "./test/*", "./logs"], "showdashboard": true, - "dashboards": [{"name": "Meshery Server", "port": 9081},{"name": "Image Hub", "port": 8080}], + "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Image Hub", "port": 8080}], "uilayout": "terminal-iframe" }, "backend": { - "imageid": "kubernetes-cluster-running:1.18" + "imageid": "kubernetes-cluster-running:1.22" } } \ No newline at end of file diff --git a/Meshery-Adapters/osm-meshery-adapter/step1.md b/Meshery-Adapters/osm-meshery-adapter/step1.md index bdb24a7..5c883c7 100644 --- a/Meshery-Adapters/osm-meshery-adapter/step1.md +++ b/Meshery-Adapters/osm-meshery-adapter/step1.md @@ -14,18 +14,26 @@ Meshery can be downloaded, installed, and launched with a single command: Meshery is now available at host:`9081`. +>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. + +To know that the Meshery has loaded with all the components connected, run + +`mesheryctl system status`{{execute}}. + +If all the components are in ready state you can open Mehsery UI tab with everything connected. + ## Open Meshery UI Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/ -- Click on the **Meshery UI** tab +- Click on new tab icon the **Meshery UI** tab - Click on **Display Port** **Welcome to Meshery!** Choose **Meshery** as your provider. Sign in to get started. -![Meshery landing page](./assets/meshery-none-provider.png) +![Meshery landing page](./assets/starting-page.png) ## Connect your cluster with Meshery diff --git a/Meshery-Adapters/osm-meshery-adapter/step2.md b/Meshery-Adapters/osm-meshery-adapter/step2.md index 6ee466b..c1b4a91 100644 --- a/Meshery-Adapters/osm-meshery-adapter/step2.md +++ b/Meshery-Adapters/osm-meshery-adapter/step2.md @@ -1,13 +1,13 @@ Meshery allows you to install any service mesh with a single click: -## 1. Select `Open-Service-Mesh` from the Management menu +## 1. Select `Open-Service-Mesh` from the Lifecycle menu ![Meshery adapter for Open-Service-Mesh](./assets/osm-adapter.png) ## 2. In the Open Service Mesh management page: - Type `osm-system` into the namespace field -- Click the (+) icon on the Install card and select `Open Service Mesh` to install the latest version of Open Service Mesh +- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Open Service Mesh` to install the latest version of Open Service Mesh ![Install Open Service Mesh using Meshery](./assets/install-osm.png) @@ -16,6 +16,7 @@ Meshery allows you to install any service mesh with a single click: Open Service Mesh has been deployed in a separate Kubernetes namespace: osm-system. To check if Open Service Mesh is along with all the pieces that have been deployed, execute the following: `kubectl get all -n osm-system`{{execute}} +You can continue to next step after all the components displayed on the terminal after running this command, are in ready state. The details of your configuration will also be reflected on the Meshery dashboard: diff --git a/Meshery-Adapters/osm-meshery-adapter/step3.md b/Meshery-Adapters/osm-meshery-adapter/step3.md index 69e2607..a1168ef 100644 --- a/Meshery-Adapters/osm-meshery-adapter/step3.md +++ b/Meshery-Adapters/osm-meshery-adapter/step3.md @@ -6,8 +6,8 @@ Sample Applications are deployed on top of a service mesh to help you explore an ## Deploy Image Hub on Open Service Mesh -- Navigate to the **Open Service Mesh Management** page on Meshery with `default` in the Namespace field. -- Select the `Image Hub` in the `Sample Application` drop down menu. +- Navigate to the **Open Service Mesh Management** page on Meshery under `Lifecycle` menu with `default` in the Namespace field. +- Select the `Image Hub Application` in the `Manage Sample Application Lifecyle` drop down menu. ![Open Service Mesh Sample Apps](./assets/osm-sample.png) diff --git a/Meshery-Adapters/traefik-meshery-adapter/assets/starting-page.png b/Meshery-Adapters/traefik-meshery-adapter/assets/starting-page.png new file mode 100644 index 0000000..b9167ed Binary files /dev/null and b/Meshery-Adapters/traefik-meshery-adapter/assets/starting-page.png differ diff --git a/Meshery-Adapters/traefik-meshery-adapter/index.json b/Meshery-Adapters/traefik-meshery-adapter/index.json index facc88a..c9f314f 100644 --- a/Meshery-Adapters/traefik-meshery-adapter/index.json +++ b/Meshery-Adapters/traefik-meshery-adapter/index.json @@ -36,11 +36,11 @@ "hideHiddenFiles": true, "exclusionPatterns": ["*test", "./test/*", "./logs"], "showdashboard": true, - "dashboards": [{"name": "Meshery Server", "port": 9081},{"name": "Image Hub", "port": 8080}], + "dashboards": [{"name": "Meshery UI", "port": 9081},{"name": "Image Hub", "port": 8080}], "uilayout": "terminal-iframe" }, "backend": { - "imageid": "kubernetes-cluster-running:1.18" + "imageid": "kubernetes-cluster-running:1.22" } } \ No newline at end of file diff --git a/Meshery-Adapters/traefik-meshery-adapter/step1.md b/Meshery-Adapters/traefik-meshery-adapter/step1.md index 6211e77..82238cd 100644 --- a/Meshery-Adapters/traefik-meshery-adapter/step1.md +++ b/Meshery-Adapters/traefik-meshery-adapter/step1.md @@ -14,18 +14,26 @@ Meshery can be downloaded, installed, and launched with a single command: Meshery is now available at host:`9081`. +>NOTE: If you see a vim page please press `q` and `y`. Also if you see an error stating `Failed to open Meshery in browser, please point your browser to....` please ignore it. + +To know that the Meshery has loaded with all the components connected, run + +`mesheryctl system status`{{execute}}. + +If all the components are in ready state you can open Mehsery UI tab with everything connected. + ## Open Meshery UI Find the **Meshery UI** tab is configured to be listening at `http://localhost:9081`/ -- Click on the **Meshery UI** tab +- Click on new tab icon the **Meshery UI** tab - Click on **Display Port** **Welcome to Meshery!** Choose **Meshery** as your provider. Sign in to get started. -![Meshery landing page](./assets/meshery-none-provider.png) +![Meshery landing page](./assets/starting-page.png) ## Connect your cluster with Meshery diff --git a/Meshery-Adapters/traefik-meshery-adapter/step2.md b/Meshery-Adapters/traefik-meshery-adapter/step2.md index ad2963e..cf821d2 100644 --- a/Meshery-Adapters/traefik-meshery-adapter/step2.md +++ b/Meshery-Adapters/traefik-meshery-adapter/step2.md @@ -1,13 +1,13 @@ Meshery allows you to install any service mesh with a single click: -## 1. Select `Traefik-Mesh` from the Management menu +## 1. Select `Traefik-Mesh` from the Lifecycle menu ![Meshery adapter for Traefik-Mesh](./assets/traefik-mesh-adapter.png) ## 2. In the Traefik Mesh management page: - Type `traefik-system` into the namespace field -- Click the (+) icon on the Install card and select `Traefik Mesh` to install the latest version of Traefik Mesh +- Click the (+) icon on the Manage Service Mesh Lifecycle card and select `Traefik Mesh` to install the latest version of Traefik Mesh ![Install Traefik-Mesh using Meshery](./assets/install-traefik.png) @@ -16,6 +16,7 @@ Meshery allows you to install any service mesh with a single click: Traefik Mesh has been deployed in a separate Kubernetes namespace: traefik-system. To check if Traefik Mesh is along with all the pieces that have been deployed, execute the following: `kubectl get all -n traefik-system`{{execute}} +You can continue to next step after all the components displayed on the terminal after running this command, are in ready state. The details of your configuration will also be reflected on the Meshery dashboard: diff --git a/Meshery-Adapters/traefik-meshery-adapter/step3.md b/Meshery-Adapters/traefik-meshery-adapter/step3.md index 3c7931e..8abb749 100644 --- a/Meshery-Adapters/traefik-meshery-adapter/step3.md +++ b/Meshery-Adapters/traefik-meshery-adapter/step3.md @@ -6,8 +6,8 @@ Sample Applications are deployed on top of a service mesh to help you explore an ## Deploy Image Hub on Traefik Mesh -- Navigate to the **Traefik Mesh Management** page on Meshery with `default` in the Namespace field. -- Select the `Image Hub` in the `Sample Application` drop down menu. +- Navigate to the **Traefik Mesh Management** page on Meshery UI under `Lifecycle` menu with `default` in the Namespace field. +- Select the `Image Hub Application` in the `Sample Application` drop down menu. ![Traefik Mesh Sample Apps](./assets/traefik-sample.png)