mirror of
https://github.com/kubeshark/kubeshark.git
synced 2025-06-26 08:14:42 +00:00
moved headless to root config, use headless in view (#450)
This commit is contained in:
parent
5382a52025
commit
ea0b3fb34e
@ -827,21 +827,21 @@ func TestTapDumpLogs(t *testing.T) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var dumpsLogsPath string
|
var dumpLogsPath string
|
||||||
for _, file := range files {
|
for _, file := range files {
|
||||||
fileName := file.Name()
|
fileName := file.Name()
|
||||||
if strings.Contains(fileName, "mizu_logs") {
|
if strings.Contains(fileName, "mizu_logs") {
|
||||||
dumpsLogsPath = path.Join(mizuFolderPath, fileName)
|
dumpLogsPath = path.Join(mizuFolderPath, fileName)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if dumpsLogsPath == "" {
|
if dumpLogsPath == "" {
|
||||||
t.Errorf("dump logs file not found")
|
t.Errorf("dump logs file not found")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
zipReader, zipError := zip.OpenReader(dumpsLogsPath)
|
zipReader, zipError := zip.OpenReader(dumpLogsPath)
|
||||||
if zipError != nil {
|
if zipError != nil {
|
||||||
t.Errorf("failed to get zip reader, err: %v", zipError)
|
t.Errorf("failed to get zip reader, err: %v", zipError)
|
||||||
return
|
return
|
||||||
|
@ -93,16 +93,16 @@ func getDefaultCommandArgs() []string {
|
|||||||
telemetry := "telemetry=false"
|
telemetry := "telemetry=false"
|
||||||
agentImage := "agent-image=gcr.io/up9-docker-hub/mizu/ci:0.0.0"
|
agentImage := "agent-image=gcr.io/up9-docker-hub/mizu/ci:0.0.0"
|
||||||
imagePullPolicy := "image-pull-policy=Never"
|
imagePullPolicy := "image-pull-policy=Never"
|
||||||
|
headless := "headless=true"
|
||||||
|
|
||||||
return []string{setFlag, telemetry, setFlag, agentImage, setFlag, imagePullPolicy}
|
return []string{setFlag, telemetry, setFlag, agentImage, setFlag, imagePullPolicy, setFlag, headless}
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDefaultTapCommandArgs() []string {
|
func getDefaultTapCommandArgs() []string {
|
||||||
headless := "--headless"
|
|
||||||
tapCommand := "tap"
|
tapCommand := "tap"
|
||||||
defaultCmdArgs := getDefaultCommandArgs()
|
defaultCmdArgs := getDefaultCommandArgs()
|
||||||
|
|
||||||
return append([]string{tapCommand, headless}, defaultCmdArgs...)
|
return append([]string{tapCommand}, defaultCmdArgs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDefaultTapCommandArgsWithDaemonMode() []string {
|
func getDefaultTapCommandArgsWithDaemonMode() []string {
|
||||||
@ -135,11 +135,17 @@ func getDefaultConfigCommandArgs() []string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func getDefaultCleanCommandArgs() []string {
|
func getDefaultCleanCommandArgs() []string {
|
||||||
return []string{"clean"}
|
cleanCommand := "clean"
|
||||||
|
defaultCmdArgs := getDefaultCommandArgs()
|
||||||
|
|
||||||
|
return append([]string{cleanCommand}, defaultCmdArgs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getDefaultViewCommandArgs() []string {
|
func getDefaultViewCommandArgs() []string {
|
||||||
return []string{"view"}
|
viewCommand := "view"
|
||||||
|
defaultCmdArgs := getDefaultCommandArgs()
|
||||||
|
|
||||||
|
return append([]string{viewCommand}, defaultCmdArgs...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func retriesExecute(retriesCount int, executeFunc func() error) error {
|
func retriesExecute(retriesCount int, executeFunc func() error) error {
|
||||||
|
@ -113,5 +113,4 @@ func init() {
|
|||||||
tapCmd.Flags().String(configStructs.EnforcePolicyFile, defaultTapConfig.EnforcePolicyFile, "Yaml file path with policy rules")
|
tapCmd.Flags().String(configStructs.EnforcePolicyFile, defaultTapConfig.EnforcePolicyFile, "Yaml file path with policy rules")
|
||||||
tapCmd.Flags().String(configStructs.ContractFile, defaultTapConfig.ContractFile, "OAS/Swagger file to validate to monitor the contracts")
|
tapCmd.Flags().String(configStructs.ContractFile, defaultTapConfig.ContractFile, "OAS/Swagger file to validate to monitor the contracts")
|
||||||
tapCmd.Flags().Bool(configStructs.DaemonModeTapName, defaultTapConfig.DaemonMode, "Run mizu in daemon mode, detached from the cli")
|
tapCmd.Flags().Bool(configStructs.DaemonModeTapName, defaultTapConfig.DaemonMode, "Run mizu in daemon mode, detached from the cli")
|
||||||
tapCmd.Flags().Bool(configStructs.HeadlessMode, defaultTapConfig.HeadlessMode, "Enable headless mode.")
|
|
||||||
}
|
}
|
||||||
|
@ -626,7 +626,7 @@ func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provi
|
|||||||
}
|
}
|
||||||
|
|
||||||
logger.Log.Infof("Mizu is available at %s\n", url)
|
logger.Log.Infof("Mizu is available at %s\n", url)
|
||||||
if !config.Config.Tap.HeadlessMode {
|
if !config.Config.HeadlessMode {
|
||||||
uiUtils.OpenBrowser(url)
|
uiUtils.OpenBrowser(url)
|
||||||
}
|
}
|
||||||
if err := apiProvider.ReportTappedPods(state.tapperSyncer.CurrentlyTappedPods); err != nil {
|
if err := apiProvider.ReportTappedPods(state.tapperSyncer.CurrentlyTappedPods); err != nil {
|
||||||
|
@ -58,7 +58,9 @@ func runMizuView() {
|
|||||||
|
|
||||||
logger.Log.Infof("Mizu is available at %s\n", url)
|
logger.Log.Infof("Mizu is available at %s\n", url)
|
||||||
|
|
||||||
uiUtils.OpenBrowser(url)
|
if !config.Config.HeadlessMode {
|
||||||
|
uiUtils.OpenBrowser(url)
|
||||||
|
}
|
||||||
|
|
||||||
if isCompatible, err := version.CheckVersionCompatibility(apiServerProvider); err != nil {
|
if isCompatible, err := version.CheckVersionCompatibility(apiServerProvider); err != nil {
|
||||||
logger.Log.Errorf("Failed to check versions compatibility %v", err)
|
logger.Log.Errorf("Failed to check versions compatibility %v", err)
|
||||||
|
@ -31,6 +31,7 @@ type ConfigStruct struct {
|
|||||||
DumpLogs bool `yaml:"dump-logs" default:"false"`
|
DumpLogs bool `yaml:"dump-logs" default:"false"`
|
||||||
KubeConfigPathStr string `yaml:"kube-config-path"`
|
KubeConfigPathStr string `yaml:"kube-config-path"`
|
||||||
ConfigFilePath string `yaml:"config-path,omitempty" readonly:""`
|
ConfigFilePath string `yaml:"config-path,omitempty" readonly:""`
|
||||||
|
HeadlessMode bool `yaml:"headless" default:"false"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (config *ConfigStruct) SetDefaults() {
|
func (config *ConfigStruct) SetDefaults() {
|
||||||
|
@ -23,7 +23,6 @@ const (
|
|||||||
EnforcePolicyFile = "traffic-validation-file"
|
EnforcePolicyFile = "traffic-validation-file"
|
||||||
ContractFile = "contract"
|
ContractFile = "contract"
|
||||||
DaemonModeTapName = "daemon"
|
DaemonModeTapName = "daemon"
|
||||||
HeadlessMode = "headless"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type TapConfig struct {
|
type TapConfig struct {
|
||||||
@ -46,7 +45,6 @@ type TapConfig struct {
|
|||||||
ApiServerResources shared.Resources `yaml:"api-server-resources"`
|
ApiServerResources shared.Resources `yaml:"api-server-resources"`
|
||||||
TapperResources shared.Resources `yaml:"tapper-resources"`
|
TapperResources shared.Resources `yaml:"tapper-resources"`
|
||||||
DaemonMode bool `yaml:"daemon" default:"false"`
|
DaemonMode bool `yaml:"daemon" default:"false"`
|
||||||
HeadlessMode bool `yaml:"headless" default:"false"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (config *TapConfig) PodRegex() *regexp.Regexp {
|
func (config *TapConfig) PodRegex() *regexp.Regexp {
|
||||||
|
Loading…
Reference in New Issue
Block a user