Merge branch 'master' into addstyles

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

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

@@ -105,7 +105,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Docker stable and playground build & tag
         run: |
-          DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION=${GITHUB_REF/refs\/tags\//} --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} .
+          DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile --no-cache -t ${{ secrets.IMAGE_NAME }}:stable-latest --build-arg TOKEN=${{ secrets.GLOBAL_TOKEN }} --build-arg GIT_COMMITSHA=${GITHUB_SHA::8} --build-arg GIT_VERSION=${GITHUB_REF/refs\/tags\//} --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} --build-arg PLAYGROUND=true .
           docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_REF/refs\/tags\//}
           docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:stable-${GITHUB_SHA::8}
           docker tag ${{ secrets.IMAGE_NAME }}:stable-latest ${{ secrets.IMAGE_NAME }}:playground-latest

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

@@ -106,6 +106,7 @@ jobs:
     name: UI end-to-end tests
     if: github.repository == 'meshery/meshery'
     runs-on: ubuntu-22.04
+    timeout-minutes: 45
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -178,9 +179,10 @@ jobs:
           ADAPTER_URLS: "localhost:10000 localhost:10001 localhost:10002 localhost:10003 localhost:10004 localhost:10009 localhost:10007"
         run: |
           make server &
-          sleep 60
+          sleep 90
       - name: Install Playwright Browsers
-        run: cd ui && npx playwright install --with-deps && cd ..
+        run: npx playwright install --with-deps
+        working-directory: ui
       - name: Run Playwright End-to-End Tests
         env:
           MESHERY_SERVER_URL: "http://localhost:9081"
@@ -189,15 +191,15 @@ jobs:
           REMOTE_PROVIDER_USER_PASSWORD: ${{ secrets.REMOTE_PROVIDER_USER_PASS }}
           PROVIDER_TOKEN: ${{ secrets.PROVIDER_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN  }}
-        run: |
-          cd ui &&
-          npx playwright test --project=chromium --project=firefox --reporter="./tests/e2e/custom-playwright-reporter.js" &&
-          cd ..
+        run: npx playwright test --project=chromium --project=firefox --reporter="./tests/e2e/custom-playwright-reporter.js"
+        working-directory: ui
       - name: Save PR number
+        if: always()
         run: |
             mkdir -p ./pr
             echo ${{ github.event.number }} > ./pr/number
       - name: Upload Test Report
+        if: always()
         uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
             name: e2e-test-reporter

.github/workflows/comment-e2e-test.yml

@@ -1,3 +1,4 @@
+name: E2E Report on Pull Request Comment
 on:
   workflow_run:
     workflows: ['Meshery UI and Server']
@@ -23,13 +24,12 @@ jobs:
       with:
         script: |
             const fs = require('fs');
-            const PR_NUMBER = Number(fs.readFileSync('./pr/number'));
-            const E2ETestReporter = fs.readFileSync('./ui/test-report.md');
+            const PRNumber = Number(fs.readFileSync('./pr/number'));
+            const E2ETestReporter = String(fs.readFileSync('./ui/test-report.md'));
 
-            const { STAGING_URL } = process.env
             await github.rest.issues.createComment({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                issue_number: PR_NUMBER,
+                issue_number: PRNumber,
                 body: E2ETestReporter
             });

Makefile

@@ -30,7 +30,7 @@ docker-build:
 docker-playground-build:
 	# `make docker-playground-build` builds Meshery inside of a multi-stage Docker container.
 	# This method does NOT require that you have Go, NPM, etc. installed locally.
-	DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile -t layer5/meshery --build-arg TOKEN=$(GLOBAL_TOKEN) --build-arg GIT_COMMITSHA=$(GIT_COMMITSHA) --build-arg GIT_VERSION=$(GIT_VERSION) --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} --build-arg PROVIDER=$(LOCAL_PROVIDER) --build-arg PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) .
+	DOCKER_BUILDKIT=1 docker build -f install/docker/Dockerfile -t layer5/meshery --build-arg TOKEN=$(GLOBAL_TOKEN) --build-arg GIT_COMMITSHA=$(GIT_COMMITSHA) --build-arg GIT_VERSION=$(GIT_VERSION) --build-arg RELEASE_CHANNEL=${RELEASE_CHANNEL} --build-arg PROVIDER=$(LOCAL_PROVIDER) --build-arg PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) --build-arg PLAYGROUND=true .
 
 ## Build Meshery Server and UI container for e2e testing.
 docker-testing-env-build:
@@ -415,10 +415,10 @@ graphql-build: dep-check
 
 ## testing
 test-setup-ui:
-	cd ui && npm ci && npx playwright install --with-deps && cd ..
+	cd ui; npm ci; npx playwright install --with-deps; cd ..
 
 test-ui:
-	cd ui && npm run test:e2e && cd ..
+	cd ui; npm run test:e2e; cd ..
 
 #-----------------------------------------------------------------------------
 # Dependencies

README.md

@@ -32,7 +32,7 @@ alt="Meshery Logo" width="70%" /></picture></a><br /><br /></p>
   -->
 </p>
 
-<h5><p align="center"><i>If you’re using Meshery or if you like the project, please <a href="https://github.com/meshery/meshery/stargazers">★</a> this repository to show your support! 🤩</i></p></h5>
+<h5><p align="center"><i>If you like Meshery, please <a href="https://github.com/meshery/meshery/stargazers">★</a> this repository to show your support! 🤩</i></p></h5>
 <p align="center" >
 MESHERY IS A CLOUD NATIVE COMPUTING FOUNDATION PROJECT
 </p>

docs/_config.yml

@@ -65,7 +65,7 @@ fixedNav: 'true' # true or false
 
 permalink: /:year/:title/
 markdown: kramdown
-exclude: [_site, CHANGELOG.md, LICENSE, README.md, vendor, Makefile, v0.4, v0.5, v0.6]
+exclude: [_site, CHANGELOG.md, LICENSE, README.md, vendor, Makefile]
 
 plugins:
   - jekyll-redirect-from

docs/_data/errorref/meshery-server_errors_export.json

@@ -2905,10 +2905,10 @@
         "name": "ErrCreatingOPAInstanceCode",
         "code": "1323",
         "severity": "Alert",
-        "long_description": "Unable to create OPA instance, policies will not be evaluated.",
+        "long_description": "",
         "short_description": "Error creating OPA Instance.",
-        "probable_cause": "",
-        "suggested_remediation": ""
+        "probable_cause": "Unable to create OPA instance, policies will not be evaluated.",
+        "suggested_remediation": "Ensure relationships are registered"
       },
       "1324": {
         "name": "ErrEventStreamingNotSupportedCode",

docs/_data/errorref/mesheryctl_errors_export.json

@@ -2905,10 +2905,10 @@
         "name": "ErrCreatingOPAInstanceCode",
         "code": "1323",
         "severity": "Alert",
-        "long_description": "Unable to create OPA instance, policies will not be evaluated.",
+        "long_description": "",
         "short_description": "Error creating OPA Instance.",
-        "probable_cause": "",
-        "suggested_remediation": ""
+        "probable_cause": "Unable to create OPA instance, policies will not be evaluated.",
+        "suggested_remediation": "Ensure relationships are registered"
       },
       "1324": {
         "name": "ErrEventStreamingNotSupportedCode",

docs/_data/toc.yml

@@ -44,8 +44,13 @@
         grandchildren: 
           - title: "Scoop"
             url: installation/windows/scoop
+      - title: Upgrading Meshery ↆ
+        url: installation/upgrades
+        children:
+          - title: Meshery CLI
+            url: installation/upgrades#upgrading-meshery-cli            
       - title: Using Multiple Meshery Adapters
-        url: guides/multiple-adapters
+        url: installation/multiple-adapters
       - title: Meshery Playground
         url: installation/playground
 - title: 🧠 Concepts
@@ -94,7 +99,7 @@
 #   links:
 #     - title: Meshery Playground
 #       url: features/playground
-- title: 📚 Guides
+- title: 📚 Guides & Tutorials
   url: guides
   links:
     # - title: Deploying Designs
@@ -128,17 +133,17 @@
       url: guides/events-management
     - title: GitOps with Meshery
       url: guides/infrastructure-management/gitops-with-meshery
-    - title: Using Metrics in Meshery ↆ
+    - title: Performance Management ↆ
       url: guides/performance-management
       children:
-        - title: Performance Management
-          url: guides/performance/managing-performance
-        - title: Integrating Prometheus and Grafana
+        - title: Performance Management with Meshery 
+          url: guides/performance-management/performance-management
+        - title: Using Metrics in Meshery
           url: guides/performance-management/meshery-metrics
         - title: Interpreting Performance Test Results 
           url: guides/performance-management/interpreting-performance-test-results
-        - title: Performance Management with Meshery 
-          url: guides/performance-management/performance-management
+        - title: Performance Profiles and Tests #should go under concepts
+          url: guides/performance-management/managing-performance
     - title: Using Meshery CLI Guides ↆ
       url: guides/mesheryctl
       children:
@@ -168,11 +173,6 @@
         url: guides/tutorials/exploring-kubernetes-cronjobs
       - title: Understanding Kubernetes ConfigMaps and Secrets
         url: guides/tutorials/kubernetes-configmaps-secrets
-    - title: Upgrading Meshery ↆ
-      url: installation/upgrades
-      children:
-        - title: Meshery CLI
-          url: installation/upgrades#upgrading-meshery-cli
 # - title: ⚙️ Tasks
 #   url: tasks
 #   links:

docs/_models/kubesphere.md

@@ -11,12 +11,12 @@ integrations-subcategory: Certified Kubernetes - Distribution
 registrant: Artifact Hub
 components: 
 featureList: [
-  "Simplifies Kubernetes cluster management",
-  "Provides a user-friendly web interface",
-  "Offers various DevOps and application management tools"
+  "Drag-n-drop cloud native infrastructure designer to configure, model, and deploy your workloads.",
+  "Invite anyone to review and make changes to your private designs.",
+  "Ongoing synchronization of Kubernetes configuration and changes across any number of clusters."
 ]
-howItWorks: "Integrates Kubesphere"
-howItWorksDetails: "Easier and more efficient Kubernetes management and application delivery"
+howItWorks: "Collaborative Infrastructure as Design"
+howItWorksDetails: "Collaboratively manage infrastructure with your coworkers synchronously sharing the same designs."
 language: en
 list: include
 type: extensibility

docs/_releases/v0.8.0-beta.1.md

@@ -0,0 +1,53 @@
+---
+layout: release
+date: 2024-08-26
+tag: v0.8.0-beta.1
+---
+
+## What's New
+## 🔤 General
+- [Docs] Readme language regarding star @marblom007 (#11798)
+- track relationships that are updated by evaluator as trace @MUzairS15 (#11796)
+- Add fallback when mapping model related details for meshery curated models @MUzairS15 (#11793)
+- Update edge-firewall.json @Jougan-0 (#11789)
+- bump meshkit w/signoff @Jougan-0 (#11786)
+- bump meshkit w/signoff @Jougan-0 (#11780)
+- add missing transitions w/signoff @Jougan-0 (#11779)
+- [Relationships] ACK S3 @Jougan-0 (#11706)
+- Bump micromatch from 4.0.4 to 4.0.8 in /install/docker-extension/ui @dependabot (#11767)
+- chore: Update github.com/meshery/schemas to v0.7.25 @leecalcote (#11772)
+
+## ⌨️ Meshery CLI
+
+- Update command and fix minor bug w/signoff @Jougan-0 (#11791)
+- Update logs to be right @Jougan-0 (#11770)
+
+## 🖥 Meshery UI
+
+- chore: remove list reporter because reporter can just accept one reporter via cli @jerensl (#11784)
+- [UI] Fix dashboard chart related issue @amitamrutiya (#11775)
+- Fix: e2e test cases @jerensl (#11773)
+- [UI]: RTK Migration for Meshery Performance @senthil-athiban (#11572)
+- ci: add e2e test report using gh comment on PR @jerensl (#11697)
+
+## 🧰 Maintenance
+
+- [Chore] Delete Dockerfile @jamieplu (#11787)
+- fix: fix e2e comment body by parsing the binary buffer to string @jerensl (#11792)
+- chore: Add PLAYGROUND flag to docker-playground-build command @leecalcote (#11797)
+- chore: remove list reporter because reporter can just accept one reporter via cli @jerensl (#11784)
+- chore: add test keep commenting when fail @jerensl (#11778)
+- fix: stale e2e test @jerensl (#11776)
+- Fix: e2e test cases @jerensl (#11773)
+- ci: add e2e test report using gh comment on PR @jerensl (#11697)
+
+## 📖 Documentation
+
+- remove older docs version from exclude @vishalvivekm (#11785)
+- [Docs]:Edge shape documentation added @SAHU-01 (#11701)
+- Update sharing-a-design.md @a-singh02 (#11745)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@Jougan-0, @MUzairS15, @SAHU-01, @a-singh02, @amitamrutiya, @dependabot, @jamieplu, @jerensl, @leecalcote, @marblom007, @senthil-athiban, @sudhanshutech and @vishalvivekm

docs/pages/concepts/architectural/architecture.md

@@ -22,8 +22,8 @@ Meshery and its components are written using the following languages and technol
 | Meshery Provider UI                                                  | ReactJS, NextJS                                                                   |
 | [Meshery Remote Providers](/extensibility/providers)                 | _any_ - must adhere to Meshery [Extension Points]({{site.baseurl}}/extensibility) |
 | [Meshery Operator](/concepts/architecture/operator)                  | Golang                                                                            |
-|      [MeshSync](/concepts/architecture/meshsync) | Golang                                                                            |
-|      [Broker](/concepts/architecture/broker)     | Golang, NATS                                                                      |
+| [MeshSync](/concepts/architecture/meshsync)                          | Golang                                                                            |
+| [Broker](/concepts/architecture/broker)                              | Golang, NATS                                                                      |
 | [Meshery Database](/concepts/architecture/database)                  | Golang, SQLlite                                                                   | 
 | [Meshery CLI](#meshery-cli) | Golang                                                                            |
 

docs/pages/guides/performance-management/index.md

@@ -15,7 +15,7 @@ Guides for understanding Meshery's ability to characterize and analyze performan
 
 <ul class="section-title">
     {% for item in sorted_pages %}
-    {% if item.type=="guides" and item.category=="performance" and item.language=="en" -%}
+    {% if item.type=="guides" and item.category=="performance" and item.language=="en" and list!="exclude" -%}
     <li><a href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a>
     {% if item.abstract != " " %}
         -  {{ item.abstract }}

docs/pages/reference/error-codes.md

@@ -86,6 +86,20 @@ Meshery and its components use a common framework (defined within MeshKit) to ge
 </ul>
 The numeric portion of error codes are component-scoped. The numeric portion of error codes are allowed to overlap between Meshery components. The combination of the <code>[component type]-[component name]-[event moniker]-[numeric code]</code> is what makes a given error code globally unique." %}
 
+### See Also
+
+Troubleshooting guides to using Meshery's various features and components.
+
+{% assign sorted_guides = site.pages | sort: "type" | reverse %}
+
+<ul>
+    {% for item in sorted_guides %}
+    {% if item.type=="guides" and item.category=="troubleshooting" and item.list!="exclude"  -%}
+      <li><a href="{{ site.baseurl }}{{ item.url }}">{{ item.title }}</a></li>
+      {% endif %}
+    {% endfor %}
+</ul>
+
 ## Error Code Categories by Component
 
 <table style="margin:auto;padding-right:25%; padding-left:20%;">

docs/v0.6/pages/installation/compatibility-matrix.md

@@ -50,7 +50,7 @@ Meshery Server and Meshery Adapters are tested daily for their compatibility wit
       </ul>
       <div class="tab-content" id="myTabContent">
         <div class="tab-pane fade show active" id="kubernetes" role="tabpanel" aria-labelledby="kubernetes-tab">
-            {%include compatibilityMatrix.md k8s_tests_group=k8s_tests_group %}
+            {%include compatibility/compatibilityMatrix.md k8s_tests_group=k8s_tests_group %}
         </div>
         <div style="text-align:center" class="tab-pane fade" id="docker" role="tabpanel" aria-labelledby="docker-tab">
         <h3 style="text-align:left;">The following minimum Docker build versions are required:</h3>

go.mod

@@ -40,7 +40,7 @@ require (
 	github.com/jinzhu/copier v0.4.0
 	github.com/layer5io/gowrk2 v0.6.1
 	github.com/layer5io/meshery-operator v0.7.0
-	github.com/layer5io/meshkit v0.7.67
+	github.com/layer5io/meshkit v0.7.70
 	github.com/layer5io/meshsync v0.6.24
 	github.com/layer5io/nighthawk-go v1.0.3
 	github.com/layer5io/service-mesh-performance v0.6.1

go.sum

@@ -1616,8 +1616,8 @@ github.com/layer5io/gowrk2 v0.6.1/go.mod h1:ugxQ23+HwQ8dmZYJd1LScw/TLKbdgfN6OOtg
 github.com/layer5io/meshery-operator v0.7.0 h1:YXlnsx2Xy5duM+W99vts2fFV4C1KnOCytQi2fxdQTUc=
 github.com/layer5io/meshery-operator v0.7.0/go.mod h1:mVMpSrvSH1zgSmcjzk+/astXV5L34NlL/PcZMH6s2IU=
 github.com/layer5io/meshkit v0.2.7/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y=
-github.com/layer5io/meshkit v0.7.67 h1:eSC9muxZr5Z7ETpLd7Jr+jLjoj+P+YmcCd4nznnLZXg=
-github.com/layer5io/meshkit v0.7.67/go.mod h1:qs3OTId50i6ejcPQ1N9rw9o79vuCXgSR4QyJle/b8O0=
+github.com/layer5io/meshkit v0.7.70 h1:kEb+iZQCl7sb0il9X2lfhQJCh90xCq3qtWxPJ9AxPvU=
+github.com/layer5io/meshkit v0.7.70/go.mod h1:0vWf6kcrD9GL0pBd/Se8c2Gs/p6MbSNEgXnfLUOp/Zc=
 github.com/layer5io/meshsync v0.6.24 h1:ui/u89NW2yHyCtdVaJuuzrag5a1CbhVB8Lp70/9Y+lw=
 github.com/layer5io/meshsync v0.6.24/go.mod h1:0qI6ATBvkVx10C1ymH62NaGPy85ALFF3T9Dx/IEXfy0=
 github.com/layer5io/nighthawk-go v1.0.3 h1:AGhip7TM8FjaDJ58jU/7BoPx+O45S7UNImfw7vC2Z0U=

mesheryctl/internal/cli/root/config/config.go

@@ -146,7 +146,8 @@ func (mc *MesheryCtlConfig) SetCurrentContext(contextName string) error {
 	}
 	_, err := mc.CheckIfCurrentContextIsValid()
 	if err != nil {
-		log.Errorf(err.Error())
+		log.Errorf("Error: %v", err.Error())
+
 	}
 
 	return err

mesheryctl/internal/cli/root/pattern/apply.go

@@ -287,7 +287,7 @@ func multiplePatternsConfirmation(profiles []models.MesheryPattern) int {
 		fmt.Printf("Name: %v\n", a.Name)
 		fmt.Printf("ID: %s\n", a.ID.String())
 		fmt.Printf("PatternFile:\n")
-		fmt.Printf(a.PatternFile)
+		fmt.Println(a.PatternFile)
 		fmt.Println("---------------------")
 	}