github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-01 02:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed namespace restricted validation (#235)

Browse Source
This commit is contained in:
RoyUP9
2021-08-19 11:33:48 +03:00
committed by GitHub
parent a34c2fc0dc
commit 667f0dc87d
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cmd/tap.go
View File

@@ -33,10 +33,6 @@ Supported protocols are HTTP and gRPC.`,
return errors.New("unexpected number of arguments") return errors.New("unexpected number of arguments")
} }
if err := config.Config.Validate(); err != nil {
return errormessage.FormatError(err)
}
if err := config.Config.Tap.Validate(); err != nil { if err := config.Config.Tap.Validate(); err != nil {
return errormessage.FormatError(err) return errormessage.FormatError(err)
} }

8
cli/cmd/tapRunner.go
View File

@@ -72,6 +72,14 @@ func RunMizuTap() {
targetNamespaces := getNamespaces(kubernetesProvider) targetNamespaces := getNamespaces(kubernetesProvider)
if config.Config.IsNsRestrictedMode() {
if len(targetNamespaces) != 1 || !mizu.Contains(targetNamespaces, config.Config.MizuResourcesNamespace) {
logger.Log.Errorf("Not supported mode. Mizu can't resolve IPs in other namespaces when running in namespace restricted mode.\n"+
"You can use the same namespace for --%s and --%s", configStructs.NamespacesTapName, config.MizuResourcesNamespaceConfigName)
return
}
}
var namespacesStr string var namespacesStr string
if !mizu.Contains(targetNamespaces, mizu.K8sAllNamespaces) { if !mizu.Contains(targetNamespaces, mizu.K8sAllNamespaces) {
namespacesStr = fmt.Sprintf("namespaces \"%s\"", strings.Join(targetNamespaces, "\", \"")) namespacesStr = fmt.Sprintf("namespaces \"%s\"", strings.Join(targetNamespaces, "\", \""))

12
cli/config/config.go
View File

@@ -3,7 +3,6 @@ package config
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/up9inc/mizu/cli/config/configStructs"
"github.com/up9inc/mizu/cli/logger" "github.com/up9inc/mizu/cli/logger"
"github.com/up9inc/mizu/cli/mizu" "github.com/up9inc/mizu/cli/mizu"
"io/ioutil" "io/ioutil"
@@ -32,17 +31,6 @@ var (
cmdName string cmdName string
) )
func (config *ConfigStruct) Validate() error {
if config.IsNsRestrictedMode() {
if config.Tap.AllNamespaces || len(config.Tap.Namespaces) != 1 || config.Tap.Namespaces[0] != config.MizuResourcesNamespace {
return fmt.Errorf("Not supported mode. Mizu can't resolve IPs in other namespaces when running in namespace restricted mode.\n"+
"You can use the same namespace for --%s and --%s", configStructs.NamespacesTapName, MizuResourcesNamespaceConfigName)
}
}
return nil
}
func InitConfig(cmd *cobra.Command) error { func InitConfig(cmd *cobra.Command) error {
cmdName = cmd.Name() cmdName = cmd.Name()