Merge branch 'master' into status/fix

steve-aldrin · Jan 2, 2025 · 7638ffe · 7638ffe
2 parents 49c3643 + 3a71dc6
commit 7638ffe
Show file tree

Hide file tree

Showing 12,640 changed files with 2,212,313 additions and 1,985 deletions.
diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml
@@ -0,0 +1,4 @@
+paths-ignore:
+  - docs/v0.*
+  - docs/assets/js/main.js
+  - docs/assets/js/search.js
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -52,8 +52,6 @@ updates:
   schedule:
     interval: monthly
   open-pull-requests-limit: 5
-  reviewers:
-  - nebula-aac
   labels:
   - kind/chore
   - pr/dependencies
diff --git a/.github/workflows/build-and-preview-site.yml b/.github/workflows/build-and-preview-site.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2 # Not needed with a .ruby-version file
+          ruby-version: 3.2.6 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
       - name: Install and Build 🔧 
         run: |

diff --git a/.github/workflows/build-and-release-edge.yml b/.github/workflows/build-and-release-edge.yml
@@ -76,7 +76,7 @@ jobs:
         if: steps.filter.outputs.modified == 'true'
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.2.6
           bundler-cache: true
       - name: graphql-docs
         if: steps.filter.outputs.modified == 'true'

diff --git a/.github/workflows/build-and-release-stable.yml b/.github/workflows/build-and-release-stable.yml
@@ -66,7 +66,7 @@ jobs:
         if: steps.filter.outputs.modified == 'true'
         uses: ruby/setup-ruby@v1.162.0
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.2.6
           bundler-cache: true
       - name: graphql-docs
         if: steps.filter.outputs.modified == 'true'
@@ -138,7 +138,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: goreleaser with tag
         uses: goreleaser/goreleaser-action@v6
         env:

diff --git a/.github/workflows/build-ui-and-server.yml b/.github/workflows/build-ui-and-server.yml
@@ -77,7 +77,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Run meshery-istio
         run: |
           mkdir -p /home/runner/.meshery/bin
@@ -220,7 +220,7 @@ jobs:
         if: steps.filter.outputs.modified == 'true'
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2.2
+          ruby-version: 3.2.6
           bundler-cache: true
       - name: graphql-docs
         if: steps.filter.outputs.modified == 'true'

diff --git a/.github/workflows/build-ui-server-reusable-workflow.yml b/.github/workflows/build-ui-server-reusable-workflow.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - run: |
           GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go build -tags draft ./server/cmd/main.go ./server/cmd/error.go
       - name: Upload artifacts

diff --git a/.github/workflows/cncf-playground-deploy-meshery.yaml b/.github/workflows/cncf-playground-deploy-meshery.yaml
@@ -26,6 +26,7 @@ jobs:
                 cd meshery
                 git restore .
                 git pull
+                docker system prune --force
                 docker compose -f install/playground/docker/docker-compose.yaml pull
                 docker compose -f install/playground/docker/docker-compose.yaml down
                 docker compose -f install/playground/docker/docker-compose.yaml up -d --remove-orphans

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,6 +12,7 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch:
 #   push:
 #     tags:
 #       - 'v*'
@@ -44,6 +45,7 @@ jobs:
       uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
+        config-file: ./.github/codeql-config.yml
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.

diff --git a/.github/workflows/error-codes-updater.yaml b/.github/workflows/error-codes-updater.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@master
         with:
-          go-version: "1.21"
+          go-version: "1.23"
 
       - name: Build Error Utility
         run: |

diff --git a/.github/workflows/go-mod-sync.yaml b/.github/workflows/go-mod-sync.yaml
@@ -27,7 +27,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@master
       with:
-        go-version: "1.21"
+        go-version: "1.23"
     - name: Go mod sync utility
       run: cd meshery-extensions;make graphql-sync;
 

diff --git a/.github/workflows/go-testing-ci.yml b/.github/workflows/go-testing-ci.yml
@@ -21,7 +21,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go: [1.21]
+        go: [1.23]
         os: [ubuntu-22.04]
     name: golangci-lint
     if: github.repository == 'meshery/meshery'
@@ -49,7 +49,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Run coverage
         run: go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic
       - name: Upload coverage to Codecov
@@ -71,7 +71,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Install Docker Compose
         run: |
           sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose

diff --git a/.github/workflows/integrations-updater.yml b/.github/workflows/integrations-updater.yml
@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 # This workflow uses the service account: meshery-integrations-sheet@meshery-237716.iam.gserviceaccount.com
-# See these instructions for setup - https://theoephraim.github.io/node-google-spreadsheet/#/getting-started/authentication
+# See these instructions for setup - https://theoephraim.github.io/node-google-spreadsheet/#/guides/authentication
 
 jobs:
   integrations:
@@ -142,4 +142,4 @@ jobs:
           to: developers@meshery.io
           body: |
             The GitHub Actions workflow in ${{ github.repository }} has failed.
-            You can find more details in the GitHub Actions log ${{ github.workflow }}.
+            You can find more details in the GitHub Actions log ${{ github.workflow }}.
diff --git a/.github/workflows/mesheryctl-ci.yml b/.github/workflows/mesheryctl-ci.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
@@ -47,7 +47,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
       - name: Setup Cache
         uses: actions/cache@v4
         with:
@@ -83,7 +83,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
           check-latest: "true"
       - name: Run script 📜
         run: |

diff --git a/.github/workflows/model-generator.yml b/.github/workflows/model-generator.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21"
+          go-version: "1.23"
 
       - name: Pull changes from remote
         run: git pull origin master

diff --git a/.github/workflows/test_adapters.yaml b/.github/workflows/test_adapters.yaml
@@ -143,7 +143,7 @@ jobs:
           config='{"contexts":{"local":{"endpoint":'$svcip',"token":"default","platform":"kubernetes","adapters":[],"channel":"stable","version":"latest"}},"current-context":"local","tokens":[{"location":"auth.json","name":"default"}]}'
           echo $config  > ~/.meshery/config.yaml
       - name: Download patternfile
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: patternfile
       - name: Wait for Meshery pods to come up

diff --git a/.gitignore b/.gitignore
@@ -78,5 +78,3 @@ default.profraw
 
 wasm/policies/temp-bundle-extract-dir/**
 .nvim.lua
-
-**/.envrc
diff --git a/docs/.ruby-version b/docs/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.2.6
diff --git a/docs/Dockerfile b/docs/Dockerfile
@@ -0,0 +1,23 @@
+FROM jekyll/jekyll:4.0
+
+RUN apk update && apk add --no-cache \
+    build-base \
+    libffi-dev \
+    readline-dev \
+    zlib-dev \
+    openssl-dev \
+    bash \
+    wget \
+    curl
+
+ENV RUBY_BASE_VERSION=3.2
+ENV RUBY_VERSION=3.2.6
+
+RUN wget https://cache.ruby-lang.org/pub/ruby/${RUBY_BASE_VERSION}/ruby-${RUBY_VERSION}.tar.gz && \
+    tar -xzf ruby-${RUBY_VERSION}.tar.gz && \
+    cd ruby-${RUBY_VERSION} && \
+    ./configure && \
+    make && \
+    make install && \
+    cd .. && \
+    rm -rf ruby-${RUBY_VERSION} ruby-${RUBY_VERSION}.tar.gz
diff --git a/docs/Gemfile b/docs/Gemfile
@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby '3.2.2'
+ruby '3.2.6'
 
 #gem 'bundler', '= 2.4.14'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,5 +78,3 @@ default.profraw

		wasm/policies/temp-bundle-extract-dir/**
		.nvim.lua

		**/.envrc