Merge conflicts resolced

Signed-off-by: Ankita Sahu <[email protected]>

.github/codecov.yml

@@ -23,14 +23,14 @@ coverage:
 
 flags:
   # Filter the folders to be measured by each flag
-  front-end-integration-tests:
-    paths:
-      - ui/cypress/integration/integration
-    carryforward: true
-  front-end-e2e-tests:
-    paths:
-      - ui/cypress/integration/e2e
-    carryforward: true
+  # front-end-integration-tests:
+  #   paths:
+  #      - ui/cypress/integration/integration
+  #   carryforward: true
+  # front-end-e2e-tests:
+  #   paths:
+  #      - ui/cypress/integration/e2e
+  #   carryforward: true
   backend:
     paths:
     # Accepts only glob patterns, not regex

.github/workflows/build-and-release-stable.yml

@@ -140,12 +140,12 @@ jobs:
         with:
           go-version: "1.21"
       - name: goreleaser with tag
-        uses: goreleaser/goreleaser-action@v5
+        uses: goreleaser/goreleaser-action@v6
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_NOTES_PAT }}
           RELEASE_CHANNEL: "stable"
         with:
-          version: latest
+          version: '~> v2'
           args: release --clean --skip=validate
       - name: bump homebrew-core formula
         uses: mislav/bump-homebrew-formula-action@v3
@@ -192,8 +192,9 @@ jobs:
       - build
     name: Deploy CNCF Playground
     uses: meshery/meshery/.github/workflows/cncf-playground-deploy-meshery.yaml@master
+    with:
+      image: layer5/meshery:playground-${GITHUB_REF/refs\/tags\//}
     secrets: inherit
-
   email-on-failure:
     needs: [update-rest-api-docs, update-graphql-docs, build, ctlrelease, call-dde-release-workflow, call-helm-chart-releaser, email-meshery-release-notes-workflow, call-cncf-playground-rollout]
     if: ${{ failure() }}
@@ -223,4 +224,4 @@ jobs:
           body: |
             The workflow failed. Here are the details:
             ${{ env.EMAIL_BODY }}
-            Workflow run log URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            Workflow run log URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.github/workflows/build-release.yml

@@ -0,0 +1,57 @@
+name: Meshery Build and Releaser (meshery-extensions channel)
+on:
+  workflow_dispatch:
+
+jobs:
+  docker-build-push:
+    name: Docker build and push
+    if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && success()
+    env:
+      RELEASE_CHANNEL: "kanvas"
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Fetch latest tag
+        run: |
+          echo "LATEST_TAG=$(curl --silent "https://api.github.com/repos/meshery/meshery/releases" | jq ' .[] | ."tag_name"' | sed -n 1p$'\n' | tr -d '"')" >> $GITHUB_ENV
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          ref: ${{ inputs.branch }}
+      - name: Docker login
+        uses: azure/docker-login@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Configure Meshery UI
+        run: |
+          cat << EOF > ui/ui.config.js
+          module.exports = {
+            components: {
+              navigator: false, // set false to disable the navigator component ( default: true )
+            },
+          };
+          EOF
+      - name: Docker build & tag
+        run: |
+          DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile --no-cache -t ${{ secrets.IMAGE_NAME }}:kanvas-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION=${{ env.LATEST_TAG }} --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} .
+
+          docker tag ${{ secrets.IMAGE_NAME }}:kanvas-latest ${{ secrets.IMAGE_NAME }}:kanvas-${GITHUB_SHA::8}
+
+          docker tag ${{ secrets.IMAGE_NAME }}:kanvas-latest ${{ secrets.IMAGE_NAME }}:kanvas-${{ env.LATEST_TAG }}
+      - name: Docker push
+        run: |
+          docker push ${{ secrets.IMAGE_NAME }}:kanvas-latest
+          docker push ${{ secrets.IMAGE_NAME }}:kanvas-${GITHUB_SHA::8}
+          docker push ${{ secrets.IMAGE_NAME }}:kanvas-${{ env.LATEST_TAG }}
+  call-meshery-extensions-playground-rollout:      
+    needs:
+      - docker-build-push
+    name: Deploy CNCF Extensions Playground
+    uses: layer5labs/meshery-extensions-packages/.github/workflows/deploy-meshery-extensions-playground.yml@master
+    with:
+      # should we use SHA? 
+      # As if meshery is not released but we want to deploy changes from the master branch, the release/latest tag will be same and hence the rollout will be skipped.
+      image: layer5/meshery:kanvas-${ GITHUB_SHA::8 } 
+    secrets: inherit

.github/workflows/build-ui-and-server.yml

@@ -61,7 +61,6 @@ jobs:
             /home/runner/.cache
             !~/cache/exclude
             **/node_modules
-            /home/runner/.cache/Cypress
             ~/.npm
             ${{ github.workspace }}/.next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
@@ -118,11 +117,11 @@ jobs:
         with:
           repository: layer5io/meshery-istio
           path: ./meshery-istio
-      - name: Check out meshery-consul code
-        uses: actions/checkout@v4
-        with:
-          repository: layer5io/meshery-consul
-          path: ./meshery-consul
+      # - name: Check out meshery-consul code
+      #   uses: actions/checkout@v4
+      #   with:
+      #     repository: layer5io/meshery-consul
+      #     path: ./meshery-consul
       - name: Create k8s Kind Cluster
         uses: helm/[email protected]
         with:
@@ -137,12 +136,12 @@ jobs:
           cd ./meshery-istio
           go run main.go &
           sleep 60
-      - name: Run meshery-consul
-        run: |
-          mkdir -p /home/runner/.meshery/bin
-          cd ./meshery-consul
-          go run main.go &
-          sleep 60
+      # - name: Run meshery-consul
+      #   run: |
+      #     mkdir -p /home/runner/.meshery/bin
+      #     cd ./meshery-consul
+      #     go run main.go &
+      #     sleep 60
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -157,7 +156,6 @@ jobs:
             /home/runner/.cache
             !~/cache/exclude
             **/node_modules
-            /home/runner/.cache/Cypress
             ~/.npm
             ${{ github.workspace }}/.next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
@@ -233,11 +231,10 @@ jobs:
       - name: Docker Hub Description
         if: github.event_name != 'pull_request' && startsWith(github.ref, 'refs/tags/') && success()
         uses: peter-evans/dockerhub-description@v4
-        env:
-          DOCKERHUB_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-          DOCKERHUB_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-          DOCKERHUB_REPOSITORY: ${{ secrets.IMAGE_NAME }}
-
+        with:
+            username: ${{ secrets.DOCKERHUB_USERNAME }}
+            password: ${{ secrets.DOCKERHUB_PASSWORD }}
+            repository: ${{ secrets.IMAGE_NAME }}
   # validate the swagger docs
   swaggerci:
     if: github.repository == 'meshery/meshery'

.github/workflows/build-ui-server-reusable-workflow.yml

@@ -57,7 +57,6 @@ jobs:
             /home/runner/.cache
             !~/cache/exclude
             **/node_modules
-            /home/runner/.cache/Cypress
           key: ${{ runner.os }}-node-${{ hashFiles('**/lockfiles') }}
           restore-keys: |
             ${{ runner.os }}-node-

.github/workflows/cncf-playground-deploy-meshery.yaml

@@ -1,7 +1,15 @@
 name: Playground CNCF - Deploy
 on:
   workflow_call:
+    inputs:
+      image:
+        type: string
+        default: playground-latest
   workflow_dispatch:
+    inputs:
+      image:
+        type: string
+        default: playground-latest
 jobs:
     cncf-playground-rollout:
         name: Update Meshery on CNCF playground

.github/workflows/generate_keys.yml

@@ -6,40 +6,42 @@ on:
         description: Link of the spreadsheet containing keys.
         type: string
         default: https://docs.google.com/spreadsheets/d/e/2PACX-1vQwzrUSKfuSRcpkp7sJTw1cSB63s4HCjYLJeGPWECsvqn222hjaaONQlN4X8auKvlaB0es3BqV5rQyz/pub?gid=64355745&single=true&output=csv
+  schedule:
+    - cron: "0 0 * * *"
 jobs:
   fetch-keys:
     name: Fetch Keys
-    if: github.repository == 'meshery/meshery'
     runs-on: ubuntu-22.04
     steps:
-    - name: Check out code
-      uses: actions/checkout@v4
-      with:
-        token: ${{ secrets.GH_ACCESS_TOKEN }}
-        fetch-depth: 1
-    - name: Set spreadsheet_uri as environment variable
-      run: echo "spreadsheet_uri=${{inputs.spreadsheet_uri}}" >> $GITHUB_ENV
-      if: inputs.spreadsheet_uri != ''
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          fetch-depth: 1
+      - name: Set spreadsheet_uri as environment variable
+        run: echo "spreadsheet_uri=https://docs.google.com/spreadsheets/d/e/2PACX-1vQwzrUSKfuSRcpkp7sJTw1cSB63s4HCjYLJeGPWECsvqn222hjaaONQlN4X8auKvlaB0es3BqV5rQyz/pub?gid=64355745&single=true&output=csv" >> $GITHUB_ENV
+        if: inputs.spreadsheet_uri != ''
+          echo "spreadsheet_uri=${{ inputs.spreadsheet_uri }}" >> $GITHUB_ENV
 
-    - name: Dump keys from the spreadsheet
-      run: |
-        curl -L "${{ env.spreadsheet_uri }}" -o "./keys.csv";
-    - name: Create permissions folder
-      run: |
+      - name: Dump keys from the spreadsheet
+        run: |
+          curl -L "${{ env.spreadsheet_uri }}" -o "./keys.csv";
+      - name: Create permissions folder
+        run: |
           [ ! -d "./server/permissions" ] && mkdir -p "./server/permissions";
           mv keys.csv server/permissions/keys.csv;
-    - name: Save keys.csv to docs/assets/excel
-      run: cp server/permissions/keys.csv docs/assets/excel/keys.csv
+      - name: Save keys.csv to docs/assets/excel
+        run: cp server/permissions/keys.csv docs/assets/excel/keys.csv
 
-    - name: Pull changes from remote
-      run: git pull origin master
+      - name: Pull changes from remote
+        run: git pull origin master
 
-    - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v5
-      with:
-        commit_message: Added permissions keys.
-        branch: master
-        commit_options: '--signoff'
-        commit_user_name: l5io
-        commit_user_email: [email protected]
-        commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Added permissions keys.
+          branch: master
+          commit_options: "--signoff"
+          commit_user_name: l5io
+          commit_user_email: [email protected]
+          commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>author of the commit that triggered the run

.github/workflows/meshmap.yml

@@ -1,4 +1,4 @@
-name: MeshMap Screenshot Service
+name: Meshery Snapshot Service
 on: # rebuild any PRs and main branch changes
   pull_request_target:
     types: [opened, synchronize, reopened]
@@ -37,7 +37,7 @@ jobs:
           path: action
           repository: layer5labs/meshmap-snapshot
       - id: test_result
-        uses: layer5labs/[email protected].8
+        uses: layer5labs/[email protected].11
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }} # github's personal access token example: "ghp_...."
           mesheryToken: ${{ secrets.MESHERY_TOKEN }} # Meshery Cloud Authentication token, signin to meshery-cloud to get one, example: ey.....

.github/workflows/notify-providers.yaml

@@ -10,8 +10,8 @@ on:
       - 'mesheryctl/**'
 
 jobs:
-  notify-meshmap-build:
-    name: Notify Meshmap Build
+  notify-remote-provider-build:
+    name: Notify Remote Providers of Release
     if: github.repository == 'meshery/meshery'
     runs-on: ubuntu-22.04
     steps:

Makefile

@@ -321,7 +321,7 @@ ui-meshery-build:
 ui-provider-build:
 	cd provider-ui; npm run build && npm run export; cd ..
 
-## Run Meshery Cypress Integration Tests against your local Meshery UI (cypress runs in non-interactive mode).
+## Run Meshery End-to-End Integration Tests against your local Meshery UI (runs in non-interactive mode).
 ui-integration-tests: ui-setup
 	cd ui; npm run ci-test-integration; cd ..
 

docs/_data/errorref/meshery-server_errors_export.json

@@ -3260,6 +3260,15 @@
         "short_description": "component definition not found",
         "probable_cause": "Component might not have been registered\nThe component might not be supported by default, in the version of Meshery you are currently using.",
         "suggested_remediation": "Ensure component definition is valid JSON/YAML.\nImport the model and try again."
+      },
+      "1363": {
+        "name": "ErrGetCapabilitiesCode",
+        "code": "1363",
+        "severity": "Alert",
+        "long_description": "",
+        "short_description": "",
+        "probable_cause": "Remote provider server may be down or not accepting requests.",
+        "suggested_remediation": "Make sure remote provider server is healthy and accepting requests."
       }
     }
   }

docs/_data/errorref/mesheryctl_errors_export.json

@@ -3260,6 +3260,15 @@
         "short_description": "component definition not found",
         "probable_cause": "Component might not have been registered\nThe component might not be supported by default, in the version of Meshery you are currently using.",
         "suggested_remediation": "Ensure component definition is valid JSON/YAML.\nImport the model and try again."
+      },
+      "1363": {
+        "name": "ErrGetCapabilitiesCode",
+        "code": "1363",
+        "severity": "Alert",
+        "long_description": "",
+        "short_description": "",
+        "probable_cause": "Remote provider server may be down or not accepting requests.",
+        "suggested_remediation": "Make sure remote provider server is healthy and accepting requests."
       }
     }
   }

docs/_data/mesheryctlcommands/cmds.yml

@@ -911,16 +911,17 @@ model:
       description: Import models using a file or filepath directly to the meshery registry
       usage: mesheryctl model import [ file | filepath ]
       examples:
-         - import model /path/to/[file.yaml|file.json]
-         - import model /path/to/models
+         - mesheryctl import model /path/to/[file.yaml|file.json]
+         - mesheryctl import model /path/to/models
     export:
       name: export
       description: Export a model by name to the given output type (default is oci).
-      usage: mesheryctl model export [ model-name ]
+      usage: mesheryctl model export [model-name]
       examples:
-         - model export [model-name] -l /home/meshery
-         - model export [model-name] --discard-components
-         - model export [model-name] -o yaml
+         - mesheryctl model export [model-name] -l /home/meshery
+         - mesheryctl model export [model-name] --discard-components
+         - mesheryctl model export [model-name] -o yaml
+         - mesheryctl model export [model-name] --version v0.7.3
 
 components:
   name: components

docs/_data/toc.yml

@@ -167,12 +167,14 @@
     - title: 🧑‍🔬 Tutorials ↆ
       url: guides/tutorials
       children:
-      - title: Exploring Kubernetes Pods
-        url: guides/tutorials/kubernetes-pods
-      - title: Exploring Kubernetes ConJobs
+      - title: Exploring Kubernetes CronJobs
         url: guides/tutorials/exploring-kubernetes-cronjobs
-      - title: Understanding Kubernetes ConfigMaps and Secrets
+      - title: Understanding Kubernetes ConfigMaps and Secrets with Meshery
         url: guides/tutorials/kubernetes-configmaps-secrets
+      - title: Exploring Kubernetes Pods with Meshery
+        url: guides/tutorials/kubernetes-pods
+      - title: Deploying WordPress and MySQL with Persistent Volumes with Meshery
+        url: guides/tutorials/wordpress-mysql-persistentvolume
 # - title: ⚙️ Tasks
 #   url: tasks
 #   links: