Merge branch 'master' of https://github.com/meshery/meshery into RTK-…

…migration-mesh-adapter

Signed-off-by: Senthil Athiban <[email protected]>

.github/workflows/mesheryctl-e2e.yaml

@@ -61,7 +61,7 @@ jobs:
       - name: Deploy Service Mesh
         run: |
           cat ~/auth.json
-          echo | mesheryctl mesh deploy meshery-istio --namespace istio-system -t ~/auth.json ISTIO
+          echo | mesheryctl adapter deploy meshery-istio --namespace istio-system -t ~/auth.json ISTIO
           sleep 50
         shell: '/bin/bash {0}'
 
@@ -72,7 +72,7 @@ jobs:
           platform: ${{ matrix.platform }}
           pattern_url: ${{ github.event.inputs.pattern_url }}
           pattern_file: ${{ github.event.inputs.pattern_file }}
-  
+
   scheduled-test:
     name: Scheduled e2e Test
     runs-on: ubuntu-22.04
@@ -111,10 +111,10 @@ jobs:
           profile_name: integration-e2e-workflow
           profile_filename: integration-test-config.yaml
           test_name: '${{ steps.date.outputs.date }}'
-      
+
       - name: Deploy Service Mesh
         run: |
-          echo | mesheryctl mesh deploy meshery-istio --namespace istio-system -t ~/auth.json ISTIO
+          echo | mesheryctl adapter deploy meshery-istio --namespace istio-system -t ~/auth.json ISTIO
           sleep 50
         shell: '/bin/bash {0}'
 
@@ -137,4 +137,4 @@ jobs:
         with:
           provider_token: ${{ secrets.PROVIDER_TOKEN }}
           platform: ${{ matrix.platform }}
-          pattern_url: https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/9d3b33bf-eaf6-4d06-9dd6-64aa725ab383.yaml 
+          pattern_url: https://raw.githubusercontent.com/meshery/meshery.io/master/catalog/9d3b33bf-eaf6-4d06-9dd6-64aa725ab383.yaml

docs/_data/mesheryctlcommands/cmds.yml

@@ -548,10 +548,9 @@ perf:
           usage: mesheryctl perf result --view
           example: mesheryctl perf result --view
 
-mesh:
-  name: mesh
+adapter:
+  name: adapter
   description: Lifecycle management of cloud native infrastructure
-
   subcommands:
     validate:
       name: validate
@@ -560,58 +559,58 @@ mesh:
         adapter:
           name: --adapter, -a
           description: (required) adapter to use for validation. Defaults to "meshery-osm:10010"
-          usage: mesheryctl mesh validate --adapter [name of the adapter]
-          example: mesheryctl mesh validate --adapter meshery-istio:10000 -t "~/Download/auth.json"
+          usage: mesheryctl adapter validate --adapter [name of the adapter]
+          example: mesheryctl adapter validate --adapter meshery-istio:10000 -t "~/Download/auth.json"
         namespace:
           name: --namespace, -n
           description: Kubernetes namespace to be used for deploying the validation tests and sample workload
-          usage: mesheryctl mesh validate --namespace [namespace to be used]
-          example: mesheryctl mesh validate --namespace test-x1 -t "~/Download/auth.json"
+          usage: mesheryctl adapter validate --namespace [namespace to be used]
+          example: mesheryctl adapter validate --namespace test-x1 -t "~/Download/auth.json"
         spec:
           name: --spec, -s
           description: (required) specification to be used for conformance test. Defaults to "smi"
-          usage: mesheryctl mesh validate --spec [specification to be used for conformance test]
-          example: mesheryctl mesh validate --spec smi -t "~/Download/auth.json"
+          usage: mesheryctl adapter validate --spec [specification to be used for conformance test]
+          example: mesheryctl adapter validate --spec smi -t "~/Download/auth.json"
         tokenpath:
           name: --tokenpath, -t
           description: (required) path to token for authenticating to Meshery API
-          usage: mesheryctl mesh validate --tokenPath [path to token for authentication]
-          example: mesheryctl mesh validate --tokenPath "~/Downloads/auth.json"
+          usage: mesheryctl adapter validate --tokenPath [path to token for authentication]
+          example: mesheryctl adapter validate --tokenPath "~/Downloads/auth.json"
 
     remove:
       name: remove
       description: Remove service mesh in the connected Kubernetes cluster
-      usage: mesheryctl mesh remove [args] [flags] [args]
+      usage: mesheryctl adapter remove [args] [flags] [args]
       flags:
         namespace:
           name: --namespace, -n
           description: Kubernetes namespace to be used for removing a service mesh under a specific namespace
-          usage: mesheryctl mesh remove [args] --namespace [namespace to be used]
-          example: mesheryctl mesh remove linkerd --namespace linkerd-ns -t "~/Download/auth.json"
+          usage: mesheryctl adapter remove [args] --namespace [namespace to be used]
+          example: mesheryctl adapter remove linkerd --namespace linkerd-ns -t "~/Download/auth.json"
 
     deploy:
       name: deploy
       description: Deploy a service mesh into the cluster
-      usage: mesheryctl mesh deploy [flags]
-      example: mesheryctl mesh deploy -t "~/Downloads/auth.json"
+      usage: mesheryctl adapter deploy [flags]
+      example: mesheryctl adapter deploy -t "~/Downloads/auth.json"
       flags:
         adapter:
           name: --adapter, -a
           description: (required) adapter to use for validation. Defaults to "meshery-osm:10010"
-          usage: mesheryctl mesh deploy --adapter [name of the adapter]
-          example: mesheryctl mesh deploy --adapter meshery-istio:10000
+          usage: mesheryctl adapter deploy --adapter [name of the adapter]
+          example: mesheryctl adapter deploy --adapter meshery-istio:10000
         namespace:
           name: --namespace, -n
           description: Kubernetes namespace to be used for deploying the validation tests and sample workload
-          usage: mesheryctl mesh deploy --namespace [namespace to be used]
+          usage: mesheryctl adapter deploy --namespace [namespace to be used]
           example: |
-            mesheryctl mesh deploy --namespace docker-desktop
-              mesheryctl mesh deploy --namespace minikube
+            mesheryctl adapter deploy --namespace docker-desktop
+              mesheryctl adapter deploy --namespace minikube
         token:
           name: --tokenpath, -t
           description: (required) path to token for authenticating to Meshery API
-          usage: mesheryctl mesh deploy --tokenPath [path to token for authentication]
-          example: mesheryctl mesh deploy --tokenPath "~/Downloads/auth.json"
+          usage: mesheryctl adapter deploy --tokenPath [path to token for authentication]
+          example: mesheryctl adapter deploy --tokenPath "~/Downloads/auth.json"
 
 pattern:
   name: pattern
@@ -964,42 +963,6 @@ components:
           example: mesheryctl components view --save "bookInfo.yaml" --output-format yaml
 
 exp:
-  components:
-    name: components
-    description: View list of components and detail of components
-    usage: mesheryctl exp components [command] [flags]
-    flags:
-      count:
-        name: --count
-        description: (optional) Get the number of exp components in total
-      help:
-        name: --help, -h
-        description: help for exp components
-        usage: mesheryctl exp components --help
-        example: mesheryctl exp components --help
-    subcommands:
-      list:
-        name: list
-        description: list all components registered in Meshery Server
-        usage: mesheryctl exp components list [flags]
-        flags:
-          page:
-            name: -p, --page
-            description: "(optional) List next set of exp components list with --page (default = 1) (default 1)."
-            usage: mesheryctl exp components list --page [page number]
-            example: mesheryctl exp components list --page 2
-      search:
-        name: search
-        description: search components registered in Meshery Server
-        usage: mesheryctl exp components search [query-text]
-      view:
-        name: view
-        description: view a component registered in Meshery Server
-        usage: mesheryctl exp components view [component-name]
-        flags:
-          output-format:
-            name: -o, --output-format
-            description: (optional) format to display in [json|yaml] (default "yaml")
   connections:
     name: connections
     description: Manage connections

docs/_integrations/istio/1.23.0-rc.1.md

@@ -0,0 +1,23 @@
+---
+component: 1.23.0-rc.1
+integrations:
+    - authorizationpolicy.Istio
+    - destinationrule.Istio
+    - envoyfilter.Istio
+    - gateway.Istio
+    - grafanaistioaddon_meshmodel.json
+    - istioMesh_meshmodel.json
+    - jaegeristioaddon_meshmodel.json
+    - peerauthentication.Istio
+    - prometheusistioaddon_meshmodel.json
+    - proxyconfig.Istio
+    - requestauthentication.Istio
+    - serviceentry.Istio
+    - sidecar.Istio
+    - telemetry.Istio
+    - virtualservice.Istio
+    - wasmplugin.Istio
+    - workloadentry.Istio
+    - workloadgroup.Istio
+    - zipkinistioaddon_meshmodel.json
+---

docs/pages/reference/mesheryctl-commands.md

@@ -465,52 +465,36 @@ Installation, troubleshooting and debugging of Meshery and its adapters
     <th>Flag</th>
     <th>Function</th>
   </tr>
-  {% assign command7 = site.data.mesheryctlcommands.cmds.mesh %}
+  {% assign command7 = site.data.mesheryctlcommands.cmds.adapter %}
+    {% assign subcommand_flag_count = 0 %}
+    {% for subcommand_hash in command7.subcommands %}
+      {% assign subcommand = subcommand_hash[1] %}
+      {% assign subcommand_flag_count = subcommand_flag_count | plus: subcommand.flags.size %}
+    {% endfor %}
+    {% assign total_rowspan = command7.subcommands.size | plus: subcommand_flag_count | plus: command7.flags.size | plus: 1 %}
     <tr>
-      <td rowspan=13><a href="{{ site.baseurl }}/reference/mesheryctl/mesh">{{ command7.name }}</a></td>
+      <td rowspan={{ total_rowspan }}><a href="{{ site.baseurl }}/reference/mesheryctl/{{ command7.name }}">{{ command7.name }}</a></td>
       <td></td>
       <td></td>
       <td>{{ command7.description }}</td>
     </tr>
-    {% assign subcommand1 = command7.subcommands.validate %}
-      <tr>
-        <td rowspan=5><a href="{{ site.baseurl }}/reference/mesheryctl/mesh/validate">{{ subcommand1.name }}</a></td>
-        <td></td>
-        <td>{{ subcommand1.description }}</td>
-      </tr>
-      {% for flag_hash in subcommand1.flags %}{% assign flag = flag_hash[1] %}
-        <tr>
-          <td>{{ flag.name }}</td>
-          <td>{{ flag.description }}</td>
-        </tr>
-      {% endfor %}
-    {% assign subcommand2 = command7.subcommands.remove %}
-      <tr>
-        <td rowspan=2><a href="{{ site.baseurl }}/reference/mesheryctl/mesh/remove">{{ subcommand2.name }}</a></td>
-        <td></td>
-        <td>{{ subcommand2.description }}</td>
-      </tr>
-      {% for flag_hash in subcommand2.flags %}{% assign flag = flag_hash[1] %}
-        <tr>
-          <td>{{ flag.name }}</td>
-          <td>{{ flag.description }}</td>
-        </tr>
-      {% endfor %}
-    {% assign subcommand3 = command7.subcommands.deploy %}
+    {% for subcommand_hash in command7.subcommands %}{% assign subcommand = subcommand_hash[1] %}
       <tr>
-        <td rowspan=4><a href="{{ site.baseurl }}/reference/mesheryctl/mesh/deploy">{{ subcommand3.name }}</a></td>
+        <td rowspan={{ subcommand.flags.size | plus: 1 }} ><a href="{{ site.baseurl }}/reference/mesheryctl/{{ command7.name }}/{{ subcommand.name }}">{{ subcommand.name }}</a></td>
         <td></td>
-        <td>{{ subcommand3.description }}</td>
+        <td>{{ subcommand.description }}</td>
       </tr>
-      {% for flag_hash in subcommand3.flags %}{% assign flag = flag_hash[1] %}
+      {% for flag_hash in subcommand.flags %}{% assign flag = flag_hash[1] %}
         <tr>
           <td>{{ flag.name }}</td>
           <td>{{ flag.description }}</td>
         </tr>
       {% endfor %}
+    {% endfor %}
 </thead>
 </table>
 
+
 ## Cloud Native Pattern Configuration and Management
 
 <table>

docs/pages/reference/mesheryctl/mesheryctl-adapter-deploy.md

@@ -0,0 +1,97 @@
+---
+layout: default
+title: mesheryctl-adapter-deploy
+permalink: reference/mesheryctl/adapter/deploy
+redirect_from: reference/mesheryctl/adapter/deploy/
+type: reference
+display-title: "false"
+language: en
+command: adapter
+subcommand: deploy
+---
+
+# mesheryctl adapter deploy
+
+Deploy infrastructure to the Kubernetes cluster
+
+## Synopsis
+
+Deploy infrastructure to the connected Kubernetes cluster
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+mesheryctl adapter deploy [flags]
+
+</div>
+</pre> 
+
+## Examples
+
+Deploy a infrastructure from an interactive on the default namespace
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+mesheryctl adapter deploy
+
+</div>
+</pre> 
+
+Deploy infrastructure
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+mesheryctl adapter deploy linkerd
+
+</div>
+</pre> 
+
+Deploy Linkerd mesh on a specific namespace
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+mesheryctl adapter deploy linkerd --namespace linkerd-ns
+
+</div>
+</pre> 
+
+Deploy Linkerd mesh and wait for it to be deployed
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+mesheryctl adapter deploy linkerd --watch
+
+</div>
+</pre> 
+
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+
+
+</div>
+</pre> 
+
+## Options
+
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+  -h, --help               help for deploy
+  -n, --namespace string   Kubernetes namespace to be used for deploying the validation tests and sample workload (default "default")
+  -t, --token string       Path to token for authenticating to Meshery API
+  -w, --watch              Watch for events and verify operation (in beta testing)
+
+</div>
+</pre>
+
+## Options inherited from parent commands
+
+<pre class='codeblock-pre'>
+<div class='codeblock'>
+      --config string   path to config file (default "/home/runner/.meshery/config.yaml")
+  -v, --verbose         verbose output
+
+</div>
+</pre>
+
+## Screenshots
+
+Usage of mesheryctl adapter deploy
+![mesh-deploy-usage](/assets/img/mesheryctl/deploy-mesh.png)
+
+## See Also
+
+Go back to [command reference index](/reference/mesheryctl/), if you want to add content manually to the CLI documentation, please refer to the [instruction](/project/contributing/contributing-cli#preserving-manually-added-documentation) for guidance.