Merge branch 'master' into fix-sortby-arrow-error

Signed-off-by: Vivek Vishal <[email protected]>

.github/workflows/add-catalog.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.23'
 
       - name: Set env
         run: |
@@ -76,10 +76,10 @@ jobs:
             compatibility=""
             echo "contentID=$designId" >> $GITHUB_OUTPUT
             # check if directory doesn't exists; then create it
-            if [ ! -d "./collections/_catalog/"$(echo $filterType | tr '[:upper:]' '[:lower:]')"" ]; then
+            if [ ! -d "./collections/_filters/"$(echo $filterType | tr '[:upper:]' '[:lower:]')"" ]; then
               echo "$(echo $filterType | tr '[:upper:]' '[:lower:]') doesn't exist."
                echo "Creating directory...$(echo $filterType | tr '[:upper:]' '[:lower:]')"
-              mkdir "./collections/_catalog/"$(echo $filterType | tr '[:upper:]' '[:lower:]')""
+              mkdir "./collections/_filters/"$(echo $filterType | tr '[:upper:]' '[:lower:]')""
             fi
 
             if [[ $filterInfo == "null" ]]; then
@@ -135,7 +135,7 @@ jobs:
             $filterCaveats
           URL: 'https://raw.githubusercontent.com/meshery/meshery.io/master/$MESHERY_CATALOG_FILES_DIR/$filterId.yaml'
           downloadLink: $filterId.yaml
-          ---" > ./collections/_catalog/"$(echo $filterType | tr '[:upper:]' '[:lower:]')"/$filterId.md
+          ---" > ./collections/_filters/"$(echo $filterType | tr '[:upper:]' '[:lower:]')"/$filterId.md
           done
           rm temp.json
 
@@ -158,7 +158,6 @@ jobs:
           repository: ./meshery
           commit_user_name: l5io
           commit_user_email: [email protected]
-          commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           commit_options: "--signoff"
           commit_message: "[Docs] Update _catalog collection"
           branch: master
@@ -174,7 +173,6 @@ jobs:
           repository: ./meshery.io
           commit_user_name: l5io
           commit_user_email: [email protected]
-          commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
           commit_options: '--signoff'
           commit_message: '[Catalog] Update Catalog items'
           branch: master

.github/workflows/error-code-updater.yml

@@ -0,0 +1,65 @@
+name: Error Codes Utility Runner
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "master"
+    paths:
+      - "assets/artifact-hub-pkg/**.go"
+
+jobs:
+  Update-error-codes:
+    name: Error codes utility
+    if: github.repository == 'meshery/meshery.io'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+        with:
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          ref: "master"
+
+      - name: Setup Go
+        uses: actions/setup-go@master
+        with:
+          go-version: "1.23"
+
+      - name: Run utility
+        run: |
+          go run github.com/layer5io/meshkit/cmd/errorutil -d ./assets/artifact-hub-pkg update -i ./assets/artifact-hub-pkg -o ./assets/artifact-hub-pkg
+
+      - name: Pull changes from remote
+        run: git pull origin master
+
+      - name: Commit changes to meshery.io
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_user_name: l5io
+          commit_user_email: [email protected]
+          commit_author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          commit_options: "--signoff"
+          commit_message: "run error codes utility for artifact-hub-pkg"
+          file_pattern: assets/artifact-hub-pkg/**.go assets/artifact-hub-pkg/component_info.json
+
+      - name: Checkout meshery
+        uses: actions/checkout@master
+        with:
+          repository: "meshery/meshery"
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+          path: "meshery"
+          ref: "master"
+
+      - name: Update and push docs
+        run: |
+          echo '{ "errors_export": "" }' | jq --slurpfile export ./assets/artifact-hub-pkg/errorutil_errors_export.json '.errors_export = $export[0]' > ./meshery/docs/_data/errorref/artifact-hub-pkg_errors_export.json
+
+          cd ./meshery
+          git config user.name l5io
+          git config user.email [email protected]
+          if git diff --exit-code --quiet
+          then
+            echo "No changes to commit"
+            exit
+          fi
+          git add ./docs/_data/errorref/artifact-hub-pkg_errors_export.json
+          git commit -m "[Docs] Error Code Reference: Updated codes for Artifact Hub Package" --signoff
+          git push origin master

.github/workflows/jekyll.yml

@@ -51,7 +51,7 @@ jobs:
     environment:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     steps:
       - name: Deploy to GitHub Pages

.github/workflows/kanvas.yml

@@ -36,7 +36,7 @@ permissions:
 
 jobs:
   KanvasScreenshot:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       resource_url: ${{ steps.test_result.outputs.resource_url }}
     steps:
@@ -54,7 +54,7 @@ jobs:
          echo ${{ inputs.assetLocation }}
         shell: bash
       - id: test_result
-        uses: layer5labs/[email protected].19
+        uses: layer5labs/[email protected].20
         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/tweet-label.yaml

@@ -13,7 +13,7 @@ permissions:
 jobs:
   action:
     if: ${{ github.event.label.name == 'issue/tweet' }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check if organization maintainer
         uses: tspascoal/get-user-teams-membership@v2

.github/workflows/updateDiscussons.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   update:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository == 'meshery/meshery.io'
     steps:
       - name: Checkout

.gitpod.yml

@@ -3,6 +3,10 @@
 # and commit this file to your remote git repository to share the goodness with others.
 
 tasks:
-  - init: make && bundle install
+  - init: |
+      # Install the Ruby version from Gemfile 
+      ruby_version=$(grep 'ruby ' Gemfile | head -n 1 | cut -d"'" -f2) 
+      rvm install $ruby_version
+      make && bundle install
 
 

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-# ruby '3.2.2'
+ruby '3.2.2'
 
 gem 'jekyll', '4.3.4'
 gem 'tzinfo-data', platforms: [:x64_mingw]

Gemfile.lock

@@ -191,5 +191,8 @@ DEPENDENCIES
   tzinfo-data
   wdm (>= 0.1.0)
 
+RUBY VERSION
+   ruby 3.2.2p53
+
 BUNDLED WITH
    2.6.0

Makefile

@@ -5,6 +5,9 @@ ARTIFACTHUB_SCRIPT_DIR := $(REPO_ROOT)/assets/scripts
 site:
 	bundle install; $(jekyll) serve --drafts --incremental --livereload --config _config_dev.yml
 
+site-no-incremental:
+	rvm use 3.2.2; bundle install; $(jekyll) serve --drafts --livereload --config _config_dev.yml
+
 build:
 	$(jekyll) build --drafts
 
@@ -23,4 +26,13 @@ helm-repo-update:
 
 .PHONY: artifacthub-artifacts
 artifacthub-artifacts:
-	cd $(ARTIFACTHUB_SCRIPT_DIR); go run hub.go
+	cd $(ARTIFACTHUB_SCRIPT_DIR); go run hub.go
+
+# Clean target to remove generated files
+.PHONY: clean
+clean:
+	rm -rf _site
+	rm -rf .jekyll-metadata
+	rm -rf .jekyll-cache
+	docker stop meshery-io || true
+	docker rm meshery-io || true

_config.yml

@@ -55,10 +55,15 @@ collections:
     output: true
   catalog:
     output: true
-    sort_by: patternId
+    # sort_by: patternId
   models:
     output: true
     permalink: /:collection/:name
+    sort_by: name
+  filters:
+    output: true
+    permalink: /:collection/:name
+    sort_by: name
 
 # paginate: 5
 # paginate_path: "/blog/:num/"

_config_dev.yml

@@ -54,10 +54,15 @@ collections:
     output: true
   catalog:
     output: true
-    sort_by: patternId
+    # sort_by: patternId
   models:
     output: true
     permalink: /:collection/:name
+    sort_by: name
+  filters:
+    output: true
+    permalink: /:collection/:name
+    sort_by: name
 
 # paginate: 5
 # paginate_path: "/blog/:num/"

_data/features.yml

@@ -8,55 +8,25 @@
     - Connect Kanvas to your GitHub repo and see changes pull request-to-pull request
     - Get snapshots of your infrastructure directly in your PRs
 
-- type: 2
-  title: Operate with <span class="special-text">configuration best practices</span>
-  description: Assess your configurations against deployment and operational best practices with Meshery's configuration validator.
-  image: assets/images/screens/configuration-best-practices.gif
-  imageDescription: Istio and Kuberentes configuration best practices
+# - type: 2
+#   title: Operate with <span class="special-text">configuration best practices</span>
+#   description: Assess your configurations against deployment and operational best practices with Meshery's configuration validator.
+#   image: assets/images/screens/configuration-best-practices.gif
+#   imageDescription: Istio and Kuberentes configuration best practices
 
 - type: 3
-  title: Manage data plane intelligence with <span class="special-text">WebAssembly filters</span>
-  description: Dynamically load and manage your own WebAssembly filters using Meshery.
-  logo: /assets/images/webassembly_logo.svg
+  title: 
+  description: D
+  logo: 
   image: /assets/images/meshery-wasm.png
   imageDescription: Webassembly based Envoy Filters
-  videoPoster: /assets/images/features/wasm-filter-mgmt-poster.png
+  videoPoster: 
 
-- type: 4
-  title: Control all of your infrastructure with <span class="special-text">mesheryctl</span>
-  description: Whether managing multiple Meshery deployments, importing designs, discoverying Kubernetes clusters, do so with ease using Meshery CLI in your terminal. <div class="button-para"><a href="https://docs.meshery.io/reference/mesheryctl/" class="highlight">View Docs</a></div>
-  image: /assets/images/features/ctl/mesheryctl-system-update.jpeg
 
-- type: 5
-  title: <span class="special-text">Context-Aware</span> Policies For Applications
-  description: Leverage built-in relationships to enforce configuration best practices consistently from code to Kubernetes. Enhance development process by building custom rules in Open Policy Agent's Rego query language.
-  logo: /assets/images/opa-logo.svg
-  image: /images/meshery/meshery-policies.png
-  imageDescription: Context-aware OPA
+# - type: 5
+#   title: <span class="special-text">Context-Aware</span> Policies For Applications
+#   description: Leverage built-in relationships to enforce configuration best practices consistently from code to Kubernetes. Enhance development process by building custom rules in Open Policy Agent's Rego query language.
+#   logo: /assets/images/opa-logo.svg
+#   image: /images/meshery/meshery-policies.png
+#   imageDescription: Context-aware OPA
 
-- type: 6
-  title: Access the <span class="special-text">Cloud Native Patterns</span> for Kubernetes
-  description: Design and manage all of your cloud native infrastructure using the design configurator in Meshery or start from a template using the patterns from the catalog.
-  logoLightMode: /assets/images/patterns/service-mesh-patterns-side.svg
-  logoDarkMode: /assets/images/patterns/service-mesh-patterns-side-white.png
-  logoDescription: Cloud native design patterns
-  videoPoster: /assets/images/patterns/smp-video-poster-play.png
-
-- type: 7
-  title: Manage the <span class="special-text">performance</span> of your infrastructure and its workloads
-  description: Baseline and track your cloud native performance from release to release.
-  image: /assets/images/screens/service-mesh-performance-example.gif
-  imageDescription: Service Mesh Performance Comparison
-  imageURL: https://raw.githubusercontent.com/layer5io/meshery.io/master/assets/images/screens/service-mesh-performance-example.gif
-  list:
-    - Use performance profiles to track the historical performance of your workloads.
-    - Track your application performance from version to version.
-    - Understand behavioral differences between cloud native network functions.
-    - Compare performance across infrastructure deployments.
-
-- type: 8
-  title: Platform Engineering with Meshery's <span class="special-text"> Extension Points</span>
-  description: Meshery includes both REST APIs and GraphQL APIs, pluggable adapters via gRPCs, hot-loadable ReactJS and hot-loadable Golang binaries. The great number of <a style="width:auto;" href="https://docs.meshery.io/extensibility">extension points</a> in Meshery make it ideal as the foundation of your internal developer platform.
-  image: assets/images/features/meshery-platform-engineering.webp
-  imageURL: https://docs.meshery.io/extensibility
-  imageDescription: Meshery the Internal Developer Platform

_data/testimonials.yml

@@ -1,3 +1,10 @@
+- type: 3
+  quote: "Kanvas is what the next-generation Operations tooling will look like."
+  person: Louie Corbo
+  title: Staff Cloud Infratructure Engineer at SADA
+  image: /assets/images/photos/louie-corbo.jpeg
+
+
 - type: 1
   quote: The Meshery Extension transforms Docker Desktop into a powerful load generation utility, conveniently enabling me to deploy and configure any service mesh with a click of the button and invoke and control load-based performance tests from my desktop.
   person: Maximiliano Churichi
@@ -67,11 +74,12 @@
 - type: 1
   quote: Meshery is an innovative tool for managing our multi-cluster and multi-cloud workloads.
   person: Hein Htet Win
-  title: Kanvas User
+  title: SS&C Technologies
   image: /assets/images/hein.webp
 
 - type: 2
   quote: Meshery has so many really amazing features all of which make DevOps and SRE life easy.
   person: Anusha Sridharan
   title: Lead Software Engineer at Fidelity Investments
-  image: /assets/images/anusha.webp
+  image: /assets/images/anusha.webp
+

_includes/card.html

@@ -1,5 +1,6 @@
 
 
+<a href="/{{ pattern.permalink }}">
 <div class= "card link">  
     <div class="card-inner">
       <div class="front">
@@ -36,10 +37,4 @@ <h6 class="pattern-id">
       </div>
     </div>
   </div>  
-
-<style>
-  .chip{
-    float: left;
-  }
-</style>
-
+</a>

_includes/help-modal.html → _includes/catalog-help-modal.html

@@ -82,8 +82,9 @@
   cursor: pointer;
 }
 </style>
-<p class="catalog-subtext">
-Easily <span style="color: #00D3A9; cursor: pointer;" id="myBtn">import any catalog item</span> into Meshery. Have a design pattern to share? <a style ="color: #00D3AF; text-decoration: none;" href="https://docs.meshery.io/concepts/catalog#to-create-a-design-pattern-using-meshery-ui" target="_blank">Add yours to the catalog.</a></p>
+
+
+
 <div id="myModal" class="help-modal">
     <div class="help-modal-content">
 
@@ -140,7 +141,7 @@ <h3>Meshery CLI</h3>
 
 <script src="{{  site.baseurl }}/assets/js/help-modal.js"></script>
 <script>
-function openTab(evt, cityName) {
+function openTab(evt, tabName) {
     var i, tabcontent, tablinks;
     tabcontent = document.getElementsByClassName("tabcontent");
     for (i = 0; i < tabcontent.length; i++) {
@@ -150,7 +151,7 @@ <h3>Meshery CLI</h3>
     for (i = 0; i < tablinks.length; i++) {
       tablinks[i].className = tablinks[i].className.replace(" active", "");
     }
-    document.getElementById(cityName).style.display = "block";
+    document.getElementById(tabName).style.display = "block";
     evt.currentTarget.className += " active";
   }
 </script>