Merge branch 'master' into mymesherybranch

nwanduka · Nov 9, 2023 · 2777d09 · 2777d09
2 parents 6130bfa + 7c37eed
commit 2777d09
Show file tree

Hide file tree

Showing 1,032 changed files with 5,100 additions and 2,615 deletions.
diff --git a/.github/workflows/meshmodel-generators.yml b/.github/workflows/meshmodel-generators.yml
@@ -26,7 +26,9 @@ jobs:
 #           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
 #           restore-keys: |
 #             ${{ runner.os }}-go-
-
+
+      - name: Pull changes from remote
+        run: git pull origin master
       - name: Run component generation
         env:
            CRED: ${{ secrets.INTEGRATION_SPREADSHEET_CRED }}
@@ -61,6 +63,7 @@ jobs:
             
   update-components:
     name: Update Components
+    needs: generate-components
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code
@@ -73,14 +76,16 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: "1.21"
-
+      - name: Pull changes from remote
+        run: git pull origin master    
       - name: Run component Updater
         env:
           CRED: ${{ secrets.INTEGRATION_SPREADSHEET_CRED }}
         run: |
             cd scripts/component_updater
             go build main.go
             ./main https://docs.google.com/spreadsheets/d/e/2PACX-1vSgOXuiqbhUgtC9oNbJlz9PYpOEaFVoGNUFMIk4NZciFfQv1ewZg8ahdrWHKI79GkKK9TbmnZx8CqIe/pub\?gid\=0\&single\=true\&output\=csv --system meshery ../../server/meshmodel
+      
       - name: Commit changes 
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
@@ -104,4 +109,4 @@ jobs:
             to: [email protected]
             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/docs/_compatibility/meshery-kuma/11-07-2023-00-57-11_8d44031e.md b/docs/_compatibility/meshery-kuma/11-07-2023-00-57-11_8d44031e.md
@@ -0,0 +1,13 @@
+---
+timestamp: "2023-11-07 00:57:15 UTC Tue"
+meshery-component: meshery-kuma
+meshery-component-version: edge
+meshery-server-version: "*name"
+k8s-distro: minikube
+k8s-version: "v1.22.2"
+service-mesh: Kuma
+service-mesh-version: "2.4.4"
+tests:
+  pod/kuma-control-plane: "Not Running"
+overall-status: "failing"
+---
diff --git a/docs/_data/discuss/meshery.json b/docs/_data/discuss/meshery.json
diff --git a/docs/_data/discuss/mesheryctl.json b/docs/_data/discuss/mesheryctl.json
diff --git a/docs/_releases/v0.6.172.md b/docs/_releases/v0.6.172.md
@@ -0,0 +1,36 @@
+---
+layout: release
+date: 2023-11-06
+tag: v0.6.172
+---
+
+## What's New
+## 🔤 General
+## 🖥 Meshery UI
+
+- [Server] K8s connection management  @MUzairS15 (#9170)
+- Meshmodel new UI @ptdatta (#9184)
+- Bump billboard.js from 3.9.0 to 3.10.2 in /ui @dependabot (#9269)
+- Bump eslint-config-next from 13.5.3 to 14.0.1 in /provider-ui @dependabot (#9277)
+- Bump cypress from 13.3.0 to 13.4.0 in /provider-ui @dependabot (#9279)
+- Add sidecar icon @ShatilKhan (#9291)
+- [UI] Expose generic RJSF modal to meshery extension @Yashsharma1911 (#9304)
+
+## 🧰 Maintenance
+
+- Bump billboard.js from 3.9.0 to 3.10.2 in /ui @dependabot (#9269)
+- Bump fortio.org/fortio from 1.57.5 to 1.60.3 @dependabot (#9272)
+- Bump eslint-config-next from 13.5.3 to 14.0.1 in /provider-ui @dependabot (#9277)
+- Bump cypress from 13.3.0 to 13.4.0 in /provider-ui @dependabot (#9279)
+
+## 📖 Documentation
+
+- added some svgs in docs @iArchitSharma (#9312)
+- [Docs] Exclude old versions from rendering in local builds @leecalcote (#9310)
+- Added description of Docs capability for "alerts" @Debaditya-Som (#9226)
+- [docs] Add docs for notification center @aabidsofi19 (#9303)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@Aisuko, @Debaditya-Som, @MUzairS15, @ShatilKhan, @Yashsharma1911, @aabidsofi19, @dependabot, @dependabot[bot], @iArchitSharma, @l5io, @leecalcote, @ptdatta, @theBeginner86 and l5io
diff --git a/docs/_releases/v0.6.173.md b/docs/_releases/v0.6.173.md
@@ -0,0 +1,27 @@
+---
+layout: release
+date: 2023-11-07
+tag: v0.6.173
+---
+
+## What's New
+## 🔤 General
+## 🖥 Meshery UI
+
+- Fix Dark mode @ptdatta (#9318)
+- Enable status col in connection and add ping check @sudhanshutech (#9317)
+- [bug] Fix broken UI  @sudhanshutech (#9315)
+
+## 🐛 Bug Fixes
+
+- [bug] Fix broken UI  @sudhanshutech (#9315)
+
+## 📖 Documentation
+
+- [docs] Fix Redirection /platforms/page -> /page @theBeginner86 (#9316)
+- [bug/docs] Fix redirect from /platforms @theBeginner86 (#9314)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@MUzairS15, @l5io, @leecalcote, @ptdatta, @sudhanshutech and @theBeginner86
diff --git a/docs/pages/installation/aks.md b/docs/pages/installation/aks.md
@@ -4,6 +4,8 @@ title: AKS
 permalink: installation/kubernetes/aks
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/aks
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/bash.md b/docs/pages/installation/bash.md
@@ -4,6 +4,8 @@ title: Install Meshery CLI with Bash
 permalink: installation/linux-mac/bash
 type: installation
 category: mesheryctl
+redirect_from:
+- installation/platforms/bash
 display-title: "true"
 language: en
 list: include

diff --git a/docs/pages/installation/brew.md b/docs/pages/installation/brew.md
@@ -4,6 +4,8 @@ title: Install Meshery CLI with Brew
 permalink: installation/linux-mac/brew
 type: installation
 category: mesheryctl
+redirect_from:
+- installation/platforms/brew
 display-title: "true"
 language: en
 list: include

diff --git a/docs/pages/installation/codespaces.md b/docs/pages/installation/codespaces.md
@@ -4,6 +4,8 @@ title: Codespaces
 permalink: installation/codespaces
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/codespaces
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/docker-extension.md b/docs/pages/installation/docker-extension.md
@@ -4,6 +4,8 @@ title: Docker Extension
 permalink: installation/docker/docker-extension
 type: installation
 category: docker
+redirect_from:
+- installation/platforms/docker-extension
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/docker.md b/docs/pages/installation/docker.md
@@ -4,6 +4,8 @@ title: Docker
 permalink: installation/docker
 type: installation
 category: docker
+redirect_from:
+- installation/platforms/docker
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/eks.md b/docs/pages/installation/eks.md
@@ -4,6 +4,8 @@ title: EKS
 permalink: installation/kubernetes/eks
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/eks
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/gke.md b/docs/pages/installation/gke.md
@@ -4,6 +4,8 @@ title: GKE
 permalink: installation/kubernetes/gke
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/gke
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/helm.md b/docs/pages/installation/helm.md
@@ -4,6 +4,8 @@ title: Install Meshery with Helm
 permalink: installation/kubernetes/helm
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/helm
 display-title: "true"
 language: en
 list: include

diff --git a/docs/pages/installation/index.md b/docs/pages/installation/index.md
@@ -5,6 +5,8 @@ type: installation
 abstract: Installation procedures for deploying Meshery with mesheryctl.
 permalink: installation
 redirect_from: 
+- platforms
+- platforms/
 - installation/
 - installation/platforms
 - installation/platforms/

diff --git a/docs/pages/installation/kinD.md b/docs/pages/installation/kinD.md
@@ -4,6 +4,8 @@ title: kinD
 permalink: installation/kubernetes/kind
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/kind
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/kubernetes.md b/docs/pages/installation/kubernetes.md
@@ -4,6 +4,8 @@ title: Kubernetes
 permalink: installation/kubernetes
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/kubernetes
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/kubesphere.md b/docs/pages/installation/kubesphere.md
@@ -4,6 +4,8 @@ title: KubeSphere
 permalink: installation/kubesphere
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/kubershphere
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/linux-mac.md b/docs/pages/installation/linux-mac.md
@@ -4,6 +4,8 @@ title: Install Meshery CLI on Linux or Mac
 permalink: installation/linux-mac
 type: installation
 category: mesheryctl
+redirect_from:
+- installation/platforms/linux-mac
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/mesheryctl.md b/docs/pages/installation/mesheryctl.md
@@ -5,7 +5,8 @@ permalink: installation/mesheryctl
 type: installation
 category: mesheryctl
 redirect_from:
- - installation/mesheryctl/
+- installation/mesheryctl/
+- installation/platforms/mesheryctl
 display-title: "true"
 language: en
 list: exclude

diff --git a/docs/pages/installation/minikube.md b/docs/pages/installation/minikube.md
@@ -4,6 +4,8 @@ title: Minikube
 permalink: installation/kubernetes/minikube
 type: installation
 category: kubernetes
+redirect_from:
+- installation/platforms/minikube
 display-title: "false"
 language: en
 list: include

diff --git a/docs/pages/installation/scoop.md b/docs/pages/installation/scoop.md
@@ -4,6 +4,8 @@ title: Install Meshery CLI with Scoop
 permalink: installation/windows/scoop
 type: installation
 category: mesheryctl
+redirect_from:
+- installation/platforms/scoop
 display-title: "true"
 language: en
 list: include

diff --git a/docs/pages/installation/windows.md b/docs/pages/installation/windows.md
@@ -4,6 +4,8 @@ title: Install Meshery CLI on Windows
 permalink: installation/windows
 type: installation
 category: mesheryctl
+redirect_from:
+- installation/platforms/windows
 display-title: "true"
 language: en
 list: include

diff --git a/docs/pages/project/security-vulnerabilities.md b/docs/pages/project/security-vulnerabilities.md
@@ -9,6 +9,38 @@ category: none
 list: include
 ---
 
+## List of Announced Vulnerabilities
+
+
+<table>
+<tr>
+  <th> DATE ANNOUNCED </th>
+  <th> CVE ID </th>
+  <th> DESCRIPTION </th>
+  <th> AFFECTED COMPONENT </th>
+  <th> VULNERABLE VERSION </th>
+  <th> PATCHED VERSION </th>
+  <th> FIX DETAILS </th>
+  <th> LINKS </th>
+</tr>
+{% assign vulns = site.data.vulnerabilities.announce | sort: "Date-Announced" | reverse %}
+
+{% for vuln in vulns %}
+
+<tr>
+  <td> {{vuln.DateAnnounced}} </td>
+  <td> {{vuln.CVE}} </td>
+  <td> {{vuln.Description}} </td>
+  <td> {{vuln.AffectedComponent}} </td>
+  <td> {{vuln.VulnerableVersion}} </td>
+  <td> {{vuln.PatchedVersion}} </td>
+  <td> {{vuln.FixDetails}} </td>
+  <td> {{vuln.Links}} </td>
+</tr>
+
+{% endfor %}
+</table>
+
 ## Reporting a vulnerability
 
 We are very grateful to the security researchers and users that report
@@ -77,34 +109,4 @@ branches.
 
 As much as possible this announcement will be actionable, and include any mitigating steps customers can take prior to upgrading to a fixed version.
 
-## List of Announced Vulnerabilities
-
-
-<table>
-<tr>
-  <th> DATE ANNOUNCED </th>
-  <th> CVE ID </th>
-  <th> DESCRIPTION </th>
-  <th> AFFECTED COMPONENT </th>
-  <th> VULNERABLE VERSION </th>
-  <th> PATCHED VERSION </th>
-  <th> FIX DETAILS </th>
-  <th> LINKS </th>
-</tr>
-{% assign vulns = site.data.vulnerabilities.announce | sort: "Date-Announced" | reverse %}
 
-{% for vuln in vulns %}
-
-<tr>
-  <td> {{vuln.DateAnnounced}} </td>
-  <td> {{vuln.CVE}} </td>
-  <td> {{vuln.Description}} </td>
-  <td> {{vuln.AffectedComponent}} </td>
-  <td> {{vuln.VulnerableVersion}} </td>
-  <td> {{vuln.PatchedVersion}} </td>
-  <td> {{vuln.FixDetails}} </td>
-  <td> {{vuln.Links}} </td>
-</tr>
-
-{% endfor %}
-</table>
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/envoyproxy/go-control-plane v0.11.1
 	github.com/ghodss/yaml v1.0.0
-	github.com/go-errors/errors v1.4.2
+	github.com/go-errors/errors v1.5.1
 	github.com/go-openapi/runtime v0.26.0
 	github.com/go-openapi/strfmt v0.21.7
 	github.com/gofrs/uuid v4.4.0+incompatible
@@ -36,7 +36,7 @@ require (
 	github.com/jinzhu/copier v0.3.5
 	github.com/layer5io/gowrk2 v0.6.1
 	github.com/layer5io/meshery-operator v0.6.15
-	github.com/layer5io/meshkit v0.6.79
+	github.com/layer5io/meshkit v0.6.80
 	github.com/layer5io/meshsync v0.6.22
 	github.com/layer5io/nighthawk-go v1.0.3
 	github.com/layer5io/service-mesh-performance v0.3.4

diff --git a/go.sum b/go.sum
@@ -1020,8 +1020,9 @@ github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
 github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
-github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-errors/errors v1.5.1 h1:ZwEMSLRCapFLflTpT7NKaAc7ukJ8ZPEjzlxt8rPN8bk=
+github.com/go-errors/errors v1.5.1/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -1556,8 +1557,8 @@ github.com/layer5io/gowrk2 v0.6.1/go.mod h1:ugxQ23+HwQ8dmZYJd1LScw/TLKbdgfN6OOtg
 github.com/layer5io/meshery-operator v0.6.15 h1:IKvqMIB/xOA42JFB1IaNu6ZZLmJ3BJSvohVYIDkOG8o=
 github.com/layer5io/meshery-operator v0.6.15/go.mod h1:+lRenXgniyFfe0gVUVbuA8p+CxjywA6boybnUBsiJY8=
 github.com/layer5io/meshkit v0.2.7/go.mod h1:QvEKV8wIEOabiFlUgiu+s78GpJTsRpoRw5pgvEX077Y=
-github.com/layer5io/meshkit v0.6.79 h1:FxXtcJtQdoY6L3wL8W8YdnR7nxiNn3xY2U0o7GNC1Ec=
-github.com/layer5io/meshkit v0.6.79/go.mod h1:8dujy2ZSjnmtI7bFhMhnBUwFSlkPDyOowp6iLvxMslk=
+github.com/layer5io/meshkit v0.6.80 h1:w/2+rZtf9l59UcAXyD5nwM8C45rb7Tpo/VAjdCtePFs=
+github.com/layer5io/meshkit v0.6.80/go.mod h1:8dujy2ZSjnmtI7bFhMhnBUwFSlkPDyOowp6iLvxMslk=
 github.com/layer5io/meshsync v0.6.22 h1:e41sJ0lm5MFkAyFIkg2rwRQMNZqSMxdhhAWqQG3bvpA=
 github.com/layer5io/meshsync v0.6.22/go.mod h1:C2H8pUTCC/0t802yGyuVXkxSdGo2rAxE7+0tPnR7LSI=
 github.com/layer5io/nighthawk-go v1.0.3 h1:AGhip7TM8FjaDJ58jU/7BoPx+O45S7UNImfw7vC2Z0U=