Merge branch 'master' into dhiraj

Mohith234 · Sep 15, 2023 · e71970c · e71970c
2 parents 4a3186b + cd55c21
commit e71970c
Show file tree

Hide file tree

Showing 83 changed files with 727 additions and 1,371 deletions.
diff --git a/.github/workflows/integrations-updater.yml b/.github/workflows/integrations-updater.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           path: meshery.io
       - name: Run utility
-        run: cd meshery/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 docs layer5/src/collections/integrations meshery.io/integrations --published-only
+        run: cd meshery/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 docs layer5/src/collections/integrations meshery.io/integrations docs/ --published-only
       - name: Commit changes to Layer5.io repo
         uses: stefanzweifel/git-auto-commit-action@v4
         with:

diff --git a/custom.hbs b/custom.hbs
@@ -11,7 +11,7 @@
         </style> 
         {{{redocHead}}} 
         {{#unless disableGoogleFont}}
-        <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,700|Roboto:300,400,700" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css?family=OpenSans:300,400,700|Roboto:300,400,700" rel="stylesheet" />
         {{/unless}} 
     </head> 
     <body> 

diff --git a/docs/_integrations/linkerd/edge-23.9.1.md b/docs/_integrations/linkerd/edge-23.9.1.md
@@ -0,0 +1,14 @@
+---
+component: edge-23.9.1
+integrations:
+    - authorizationpolicy.Linkerd
+    - jaegerlinkerdaddon_meshmodel.json
+    - linkerdmesh_meshmodel.json
+    - meshtlsauthentication.Linkerd
+    - networkauthentication.Linkerd
+    - server.Linkerd
+    - serverauthorization.Linkerd
+    - serviceprofile.Linkerd
+    - smilinkerdaddon_meshmodel.json
+    - vizlinkerdaddon_meshmodel.json
+---
diff --git a/docs/_integrations/linkerd/edge-23.9.2.md b/docs/_integrations/linkerd/edge-23.9.2.md
@@ -0,0 +1,14 @@
+---
+component: edge-23.9.2
+integrations:
+    - authorizationpolicy.Linkerd
+    - jaegerlinkerdaddon_meshmodel.json
+    - linkerdmesh_meshmodel.json
+    - meshtlsauthentication.Linkerd
+    - networkauthentication.Linkerd
+    - server.Linkerd
+    - serverauthorization.Linkerd
+    - serviceprofile.Linkerd
+    - smilinkerdaddon_meshmodel.json
+    - vizlinkerdaddon_meshmodel.json
+---
diff --git a/docs/_releases/v0.6.139.md b/docs/_releases/v0.6.139.md
@@ -0,0 +1,34 @@
+---
+layout: release
+date: 2023-09-13
+tag: v0.6.139
+---
+
+## What's New
+## 🔤 General
+- [MeshModel] New shapes @leecalcote (#8762)
+- Remove Firewall Policy @leecalcote (#8759)
+- [server]Fix Index Out of Range Error Handling in Meshery Component Handler @Shiva953 (#8709)
+- Update events_persister.go @MUzairS15 (#8719)
+- [Events] Add API to return available event category and action. @MUzairS15 (#8715)
+
+## 🚀 Features
+
+- Improve search functionality using debounce @sudhanshutech (#8720)
+
+## ⌨️ Meshery CLI
+
+- FIXED: adapter deployment permission denied error on docker platform @zakisk (#8694)
+
+## 🖥 Meshery UI
+
+- Show duplicates meshmodels on toggle @sudhanshutech (#8704)
+- Improve search functionality using debounce @sudhanshutech (#8720)
+- created a folder @ritiksaxena124 (#8726)
+- change sort order from asc to desc as default @MUzairS15 (#8725)
+- [UI] Converted UserPreferences and preferences form class-based to fun… @mukeshkuiry (#8707)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@MUzairS15, @Shiva953, @Yashsharma1911, @leecalcote, @mukeshkuiry, @nebula-aac, @ritiksaxena124, @sudhanshutech, @zakisk and l5io
diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/jinzhu/copier v0.3.5
 	github.com/layer5io/gowrk2 v0.6.1
 	github.com/layer5io/meshery-operator v0.6.10
-	github.com/layer5io/meshkit v0.6.64
+	github.com/layer5io/meshkit v0.6.65
 	github.com/layer5io/meshsync v0.6.14
 	github.com/layer5io/nighthawk-go v1.0.6
 	github.com/layer5io/service-mesh-performance v0.6.1

diff --git a/go.sum b/go.sum
@@ -1571,8 +1571,8 @@ github.com/layer5io/gowrk2 v0.6.1 h1:0eBj7VFYJ+QTMJt7i3PzxDJTEL+X+zWx4OP+lARWIoI
 github.com/layer5io/gowrk2 v0.6.1/go.mod h1:ugxQ23+HwQ8dmZYJd1LScw/TLKbdgfN6OOtg6iYMljg=
 github.com/layer5io/meshery-operator v0.6.10 h1:4YiznhS4AO/bA+uHBxCYp9Fc9w9LU2sopE3oJBdRU/Y=
 github.com/layer5io/meshery-operator v0.6.10/go.mod h1:RX9yjSvJS0KAdWOb/zRfYU/mSOVP1ySuUUlxHhrms1M=
-github.com/layer5io/meshkit v0.6.64 h1:VvlIrPb0yeHVSU9D3qyEJtPSUI06XZ9FKn+eR+92zsw=
-github.com/layer5io/meshkit v0.6.64/go.mod h1:wYknaN9JfSjpT0BqaYVJC7KPSbQtD51Uw3oGUyxGVxM=
+github.com/layer5io/meshkit v0.6.65 h1:JltJ5hq8z/JIJf8V0m6UrsZ/PvIeKevLeIuAvH8q+DU=
+github.com/layer5io/meshkit v0.6.65/go.mod h1:ZepHoPUmrDQK6T4ARmyWfKy8HejxFdJsoqC1cq4Slb8=
 github.com/layer5io/meshsync v0.6.14 h1:y5Fbq76WGYWjdzYFNOD1YgowP/0m/NxPZ/hA1JGJ3RA=
 github.com/layer5io/meshsync v0.6.14/go.mod h1:21VTdYITKXpBSb+kj2CcR3T0KbrcLJwhiewQRKTqvUM=
 github.com/layer5io/nighthawk-go v1.0.6 h1:YMCw65FvwpbByX+M7McdNYRNDW9oOw3GQaXJ1RMDdGw=

diff --git a/install/Makefile.core.mk b/install/Makefile.core.mk
@@ -29,7 +29,10 @@ SHELL :=/bin/bash -o pipefail
 #-----------------------------------------------------------------------------
 # Components
 #-----------------------------------------------------------------------------
-ADAPTER_URLS := "localhost:10000 localhost:10001 localhost:10002 localhost:10004 localhost:10005 localhost:10006 localhost:10007 localhost:10009 localhost:10010 localhost:10012"
+# All Adapters
+# ADAPTER_URLS := "localhost:10000 localhost:10001 localhost:10002 localhost:10004 localhost:10005 localhost:10006 localhost:10007 localhost:10009 localhost:10010 localhost:10012"
+# No Adapters
+ADAPTER_URLS := ""
 
 #-----------------------------------------------------------------------------
 # Providers

diff --git a/mesheryctl/internal/cli/root/system/channel_test.go b/mesheryctl/internal/cli/root/system/channel_test.go
@@ -86,4 +86,4 @@ func TestViewCmd(t *testing.T) {
 			BreakupFunc()
 		})
 	}
-}
+}
diff --git a/mesheryctl/internal/cli/root/system/start.go b/mesheryctl/internal/cli/root/system/start.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
+	"os/user"
 	"path"
 	"strconv"
 	"strings"
@@ -259,13 +260,6 @@ func start() error {
 			AllowedServices[v] = services[v]
 		}
 
-		utils.ViperCompose.Set("services", AllowedServices)
-		err = utils.ViperCompose.WriteConfig()
-		if err != nil {
-			utils.Log.Error(ErrWriteConfig(errors.Wrap(err, "Unable to write context to docker.")))
-			return nil
-		}
-
 		//////// FLAGS
 		// Control whether to pull for new Meshery container images
 		if skipUpdateFlag {
@@ -307,6 +301,21 @@ func start() error {
 		}
 		endpoint.Port = int32(tempPort)
 
+		group, err := user.LookupGroup("docker")
+		if err != nil {
+			return errors.Wrap(err, utils.SystemError("unable to get GID of docker group"))
+		}
+
+		// Create the group_add option and add GID of docker group to meshery container
+		groupAdd := viper.GetStringSlice("services.meshery.group_add")
+		groupAdd = append(groupAdd, group.Gid)
+		utils.ViperCompose.Set("services.meshery.group_add", groupAdd)
+
+		// Write the modified configuration back to the Docker Compose file
+		if err := utils.ViperCompose.WriteConfig(); err != nil {
+			return errors.Wrap(err, utils.SystemError("unable to add group_add option. Meshery Server cannot perform this privileged action"))
+		}
+
 		log.Info("Starting Meshery...")
 		start := exec.Command("docker-compose", "-f", utils.DockerComposeFile, "up", "-d")
 		start.Stdout = os.Stdout

diff --git a/provider-ui/components/Provider.js b/provider-ui/components/Provider.js
@@ -131,7 +131,7 @@ export default function Provider() {
           }}
         >
           <a onClick={handleModalOpen} style={{
-            color : '#00D3A9',
+            color : '#00B39F',
             cursor : 'pointer',
             fontWeight : 700
           }}>