Merge branch 'master' into codespaces-devcontainer

meshery · Feb 9, 2023 · bc7767c · bc7767c
2 parents 97ce68d + afa71f0
commit bc7767c
Show file tree

Hide file tree

Showing 6,231 changed files with 92,834 additions and 64,527 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,7 @@
-**Description**
+**Notes for Reviewers**
 
 This PR fixes #
 
-**Notes for Reviewers**
 
 
 **[Signed commits](https://github.com/meshery/meshery/blob/master/CONTRIBUTING.md#signing-off-on-commits-developer-certificate-of-origin)**

diff --git a/.github/assets/images/meshery/meshery-logo-dark-text-side.png b/.github/assets/images/meshery/meshery-logo-dark-text-side.png
diff --git a/.github/assets/images/readme/layer5-community-sign.png b/.github/assets/images/readme/layer5-community-sign.png
diff --git a/.github/samples/BookInfoForCatalogIstio.yaml b/.github/samples/BookInfoForCatalogIstio.yaml
@@ -0,0 +1,35 @@
+name: BookInfoForCatalogIstio
+services:
+  API Service:
+    name: API Service
+    type: APIService.K8s
+    namespace: default
+    version: v1.23.3
+    settings:
+      name: API Service
+      namespace: default
+    traits:
+      meshmap:
+        edges: []
+        id: 7f544d73-9d02-46df-b5d5-b2298b29ae59
+        label: API Service
+        position:
+          posX: -12.87532858717755
+          posY: 63.026552335666615
+  Istio:
+    name: Istio
+    type: IstioMesh
+    namespace: default
+    version: 1.12.0
+    settings:
+      name: Istio
+      namespace: default
+      profile: default
+    traits:
+      meshmap:
+        edges: []
+        id: a30b2842-6885-4166-9b05-7e93db1d67aa
+        label: Istio
+        position:
+          posX: 54.58489868554972
+          posY: 57.938484153848435
diff --git a/.github/scripts/integration_publisher.sh b/.github/scripts/integration_publisher.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Setup for local testing
+# INTEGRATIONS=$(< results.json)
+# integration_count=$(jq ' .results[].result.rawData | length' results.json)
+
+# Setup for repository-based run
+#results=$(< results.json)
+curl -o integrations.csv https://docs.google.com/spreadsheets/d/e/2PACX-1vSgOXuiqbhUgtC9oNbJlz9PYpOEaFVoGNUFMIk4NZciFfQv1ewZg8ahdrWHKI79GkKK9TbmnZx8CqIe/pub?gid=0&single=true&output=csv
+brew install xsv
+xsv slice -i 7 integrations.csv | xsv select 28 | xsv flatten > a.txt
+echo "$PATH"
+echo "{path}" 
+echo $GITHUB_PATH
+echo "{path}" >> $GITHUB_PATH
+pwd
+ls
+echo $GITHUB_WORKSPACE
+
+#INTEGRATIONS=$(< $GITHUB_WORKSPACE/integrations.json)
+integration_count=$(jq ' .results[].result.rawData | length' $GITHUB_WORKSPACE/integrations.json)
+
+for (( i=0; i<integration_count; i++ ))
+do 
+    integration_name=$(jq " .results[].result.rawData[${i}][0]" -r $GITHUB_WORKSPACE/integrations.json)
+    integration_data=$(jq " .results[].result.rawData[${i}][1]" -r $GITHUB_WORKSPACE/integrations.json)
+    mkdir -p ${integration_name}/icon/color
+    mkdir -p ${integration_name}/icon/white
+    echo $integration_data > ${integration_name}/index.mdx   
+done
diff --git a/.github/scripts/results.json b/.github/scripts/results.json
diff --git a/.github/scripts/run.sh b/.github/scripts/run.sh
@@ -0,0 +1,9 @@
+#! /bin/bash
+
+while IFS="," read line
+do
+  echo "$line"
+
+
+done < <(cut -d "," -f26,3 ~/test.csv | tail -n +4)
+
diff --git a/.github/workflows/build-and-preview-site.yml b/.github/workflows/build-and-preview-site.yml
@@ -8,7 +8,7 @@ on:
       - 'docs/**'
 jobs:
   trigger-site-preview:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@master

diff --git a/.github/workflows/build-and-release-dde.yml b/.github/workflows/build-and-release-dde.yml
@@ -27,7 +27,7 @@ env:
 
 jobs:
   print-inputs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - run: |
           echo "Dispatched GIT_VERSION: ${{github.event.inputs.release-ver}}"
@@ -38,9 +38,9 @@ jobs:
           echo "Env GIT_TAG: ${{ github.event.release.tag_name }}"
 
   docker-extension:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - name: Checkout repo
+      - name: Checkout 🛎️ repo
         uses: actions/checkout@master
       - name: Identify Release Values
         if: "${{ github.event.inputs.release-ver}} != 'v' }}"

diff --git a/.github/workflows/build-and-release-edge.yml b/.github/workflows/build-and-release-edge.yml
@@ -13,7 +13,7 @@ jobs:
     if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && success()
     env:
       RELEASE_CHANNEL: "edge"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code
         uses: actions/checkout@master

diff --git a/.github/workflows/build-and-release-stable.yml b/.github/workflows/build-and-release-stable.yml
@@ -10,7 +10,7 @@ jobs:
     if: github.repository == 'meshery/meshery'
     env:
       RELEASE_CHANNEL: "stable"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code
         uses: actions/checkout@master
@@ -58,7 +58,7 @@ jobs:
         with:
           go-version: 1.19
       - name: goreleaser with tag
-        uses: goreleaser/goreleaser-action@master
+        uses: goreleaser/goreleaser-action@v4.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_NOTES_PAT }}
           RELEASE_CHANNEL: "stable"
@@ -82,4 +82,9 @@ jobs:
     name: Deploy Meshery Playground
     uses: meshery/meshery/.github/workflows/deploy-meshery-playground.yml@master
     secrets: inherit
+  email-meshery-release-notes-workflow:
+    needs: build
+    name: Email Meshery Release Notes
+    uses: layer5labs/meshery-extensions-packages/.github/workflows/notify-email.yml@master
+    secrets: inherit