diff --git a/cmd/clean.go b/cmd/clean.go index d5813646d..69020f489 100644 --- a/cmd/clean.go +++ b/cmd/clean.go @@ -33,5 +33,5 @@ func init() { log.Debug().Err(err).Send() } - cleanCmd.Flags().StringP(configStructs.SelfNamespaceLabel, "s", defaultTapConfig.SelfNamespace, "Self-namespace of Kubeshark") + cleanCmd.Flags().StringP(configStructs.ReleaseNamespaceLabel, "s", defaultTapConfig.ReleaseNamespace, "Self-namespace of Kubeshark") } diff --git a/cmd/common.go b/cmd/common.go index b48dbbd49..3a8f513d1 100644 --- a/cmd/common.go +++ b/cmd/common.go @@ -18,7 +18,7 @@ import ( ) func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx context.Context, serviceName string, podName string, proxyPortLabel string, srcPort uint16, dstPort uint16, healthCheck string) { - httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.Proxy.Host, srcPort, config.Config.Tap.SelfNamespace, serviceName) + httpServer, err := kubernetes.StartProxy(kubernetesProvider, config.Config.Tap.Proxy.Host, srcPort, config.Config.Tap.ReleaseNamespace, serviceName) if err != nil { log.Error(). Err(errormessage.FormatError(err)). @@ -38,7 +38,7 @@ func startProxyReportErrorIfAny(kubernetesProvider *kubernetes.Provider, ctx con } podRegex, _ := regexp.Compile(podName) - if _, err := kubernetes.NewPortForward(kubernetesProvider, config.Config.Tap.SelfNamespace, podRegex, srcPort, dstPort, ctx); err != nil { + if _, err := kubernetes.NewPortForward(kubernetesProvider, config.Config.Tap.ReleaseNamespace, podRegex, srcPort, dstPort, ctx); err != nil { log.Error(). Str("pod-regex", podRegex.String()). Err(errormessage.FormatError(err)). diff --git a/cmd/proxyRunner.go b/cmd/proxyRunner.go index 640514c3d..d126908dd 100644 --- a/cmd/proxyRunner.go +++ b/cmd/proxyRunner.go @@ -23,7 +23,7 @@ func runProxy(block bool, noBrowser bool) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - exists, err := kubernetesProvider.DoesServiceExist(ctx, config.Config.Tap.SelfNamespace, kubernetes.FrontServiceName) + exists, err := kubernetesProvider.DoesServiceExist(ctx, config.Config.Tap.ReleaseNamespace, kubernetes.FrontServiceName) if err != nil { log.Error(). Str("service", kubernetes.FrontServiceName). @@ -42,7 +42,7 @@ func runProxy(block bool, noBrowser bool) { return } - exists, err = kubernetesProvider.DoesServiceExist(ctx, config.Config.Tap.SelfNamespace, kubernetes.HubServiceName) + exists, err = kubernetesProvider.DoesServiceExist(ctx, config.Config.Tap.ReleaseNamespace, kubernetes.HubServiceName) if err != nil { log.Error(). Str("service", kubernetes.HubServiceName). diff --git a/cmd/tap.go b/cmd/tap.go index 9eb7600d2..7755e8659 100644 --- a/cmd/tap.go +++ b/cmd/tap.go @@ -51,7 +51,7 @@ func init() { tapCmd.Flags().Uint16(configStructs.ProxyHubPortLabel, defaultTapConfig.Proxy.Hub.Port, "Provide a custom port for the Hub proxy/port-forward") tapCmd.Flags().String(configStructs.ProxyHostLabel, defaultTapConfig.Proxy.Host, "Provide a custom host for the proxy/port-forward") tapCmd.Flags().StringSliceP(configStructs.NamespacesLabel, "n", defaultTapConfig.Namespaces, "Namespaces selector") - tapCmd.Flags().StringP(configStructs.SelfNamespaceLabel, "s", defaultTapConfig.SelfNamespace, "Self-namespace of Kubeshark") + tapCmd.Flags().StringP(configStructs.ReleaseNamespaceLabel, "s", defaultTapConfig.ReleaseNamespace, "Self-namespace of Kubeshark") tapCmd.Flags().Bool(configStructs.PersistentStorageLabel, defaultTapConfig.PersistentStorage, "Enable persistent storage (PersistentVolumeClaim)") tapCmd.Flags().String(configStructs.StorageLimitLabel, defaultTapConfig.StorageLimit, "Override the default storage limit (per node)") tapCmd.Flags().String(configStructs.StorageClassLabel, defaultTapConfig.StorageClass, "Override the default storage class of the PersistentVolumeClaim (per node)") diff --git a/cmd/tapRunner.go b/cmd/tapRunner.go index 49e9ef248..b6a7a751e 100644 --- a/cmd/tapRunner.go +++ b/cmd/tapRunner.go @@ -118,7 +118,7 @@ func printProxyCommandSuggestion() { } func finishTapExecution(kubernetesProvider *kubernetes.Provider) { - finishSelfExecution(kubernetesProvider, config.Config.IsNsRestrictedMode(), config.Config.Tap.SelfNamespace) + finishSelfExecution(kubernetesProvider, config.Config.IsNsRestrictedMode(), config.Config.Tap.ReleaseNamespace) } /* @@ -151,7 +151,7 @@ func printNoPodsFoundSuggestion(targetNamespaces []string) { func watchHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { podExactRegex := regexp.MustCompile(fmt.Sprintf("^%s$", kubernetes.HubPodName)) podWatchHelper := kubernetes.NewPodWatchHelper(kubernetesProvider, podExactRegex) - eventChan, errorChan := kubernetes.FilteredWatch(ctx, podWatchHelper, []string{config.Config.Tap.SelfNamespace}, podWatchHelper) + eventChan, errorChan := kubernetes.FilteredWatch(ctx, podWatchHelper, []string{config.Config.Tap.ReleaseNamespace}, podWatchHelper) isPodReady := false timeAfter := time.After(120 * time.Second) @@ -218,7 +218,7 @@ func watchHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, c log.Error(). Str("pod", kubernetes.HubPodName). - Str("namespace", config.Config.Tap.SelfNamespace). + Str("namespace", config.Config.Tap.ReleaseNamespace). Err(err). Msg("Failed creating pod.") cancel() @@ -242,7 +242,7 @@ func watchHubPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, c func watchFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { podExactRegex := regexp.MustCompile(fmt.Sprintf("^%s$", kubernetes.FrontPodName)) podWatchHelper := kubernetes.NewPodWatchHelper(kubernetesProvider, podExactRegex) - eventChan, errorChan := kubernetes.FilteredWatch(ctx, podWatchHelper, []string{config.Config.Tap.SelfNamespace}, podWatchHelper) + eventChan, errorChan := kubernetes.FilteredWatch(ctx, podWatchHelper, []string{config.Config.Tap.ReleaseNamespace}, podWatchHelper) isPodReady := false timeAfter := time.After(120 * time.Second) @@ -307,7 +307,7 @@ func watchFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, log.Error(). Str("pod", kubernetes.FrontPodName). - Str("namespace", config.Config.Tap.SelfNamespace). + Str("namespace", config.Config.Tap.ReleaseNamespace). Err(err). Msg("Failed creating pod.") @@ -330,7 +330,7 @@ func watchFrontPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, func watchHubEvents(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { podExactRegex := regexp.MustCompile(fmt.Sprintf("^%s", kubernetes.HubPodName)) eventWatchHelper := kubernetes.NewEventWatchHelper(kubernetesProvider, podExactRegex, "pod") - eventChan, errorChan := kubernetes.FilteredWatch(ctx, eventWatchHelper, []string{config.Config.Tap.SelfNamespace}, eventWatchHelper) + eventChan, errorChan := kubernetes.FilteredWatch(ctx, eventWatchHelper, []string{config.Config.Tap.ReleaseNamespace}, eventWatchHelper) for { select { case wEvent, ok := <-eventChan: diff --git a/config/configStruct.go b/config/configStruct.go index 0ab58146e..c80329fd7 100644 --- a/config/configStruct.go +++ b/config/configStruct.go @@ -53,7 +53,7 @@ func (config *ConfigStruct) ImagePullSecrets() []v1.LocalObjectReference { } func (config *ConfigStruct) IsNsRestrictedMode() bool { - return config.Tap.SelfNamespace != misc.Program // Notice "kubeshark" string must match the default ReleaseNamespace + return config.Tap.ReleaseNamespace != misc.Program // Notice "kubeshark" string must match the default ReleaseNamespace } func (config *ConfigStruct) KubeConfigPath() string { diff --git a/config/configStructs/tapConfig.go b/config/configStructs/tapConfig.go index e9dbb3cb7..2a5e23940 100644 --- a/config/configStructs/tapConfig.go +++ b/config/configStructs/tapConfig.go @@ -17,7 +17,7 @@ const ( ProxyHubPortLabel = "proxy-hub-port" ProxyHostLabel = "proxy-host" NamespacesLabel = "namespaces" - SelfNamespaceLabel = "releasenamespace" + ReleaseNamespaceLabel = "releasenamespace" PersistentStorageLabel = "persistentstorage" StorageLimitLabel = "storagelimit" StorageClassLabel = "storageclass" @@ -99,7 +99,7 @@ type TapConfig struct { Proxy ProxyConfig `yaml:"proxy" json:"proxy"` PodRegexStr string `yaml:"regex" json:"regex" default:".*"` Namespaces []string `yaml:"namespaces" json:"namespaces" default:"[]"` - SelfNamespace string `yaml:"selfnamespace" json:"selfnamespace" default:"kubeshark"` + ReleaseNamespace string `yaml:"releasenamespace" json:"releasenamespace" default:"default"` PersistentStorage bool `yaml:"persistentstorage" json:"persistentstorage" default:"false"` StorageLimit string `yaml:"storagelimit" json:"storagelimit" default:"200Mi"` StorageClass string `yaml:"storageclass" json:"storageclass" default:"standard"` diff --git a/errormessage/errormessage.go b/errormessage/errormessage.go index de4f4650e..4d1ee539f 100644 --- a/errormessage/errormessage.go +++ b/errormessage/errormessage.go @@ -22,9 +22,9 @@ func FormatError(err error) error { "in the config file or setting the targeted namespace with --%s %s=", err, misc.Software, - configStructs.SelfNamespaceLabel, + configStructs.ReleaseNamespaceLabel, config.SetCommandName, - configStructs.SelfNamespaceLabel) + configStructs.ReleaseNamespaceLabel) } else if syntaxError, isSyntaxError := asRegexSyntaxError(err); isSyntaxError { errorNew = fmt.Errorf("regex %s is invalid: %w", syntaxError.Expr, err) } else { diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 2958bbe39..7d999adf2 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -16,7 +16,7 @@ tap: host: 127.0.0.1 regex: .* namespaces: [] - selfnamespace: default + releasenamespace: default persistentstorage: false storagelimit: 200Mi storageclass: standard diff --git a/misc/fsUtils/kubesharkLogsUtils.go b/misc/fsUtils/kubesharkLogsUtils.go index ec517ddcf..52944a1ae 100644 --- a/misc/fsUtils/kubesharkLogsUtils.go +++ b/misc/fsUtils/kubesharkLogsUtils.go @@ -15,13 +15,13 @@ import ( func DumpLogs(ctx context.Context, provider *kubernetes.Provider, filePath string) error { podExactRegex := regexp.MustCompile("^" + kubernetes.SelfResourcesPrefix) - pods, err := provider.ListAllPodsMatchingRegex(ctx, podExactRegex, []string{config.Config.Tap.SelfNamespace}) + pods, err := provider.ListAllPodsMatchingRegex(ctx, podExactRegex, []string{config.Config.Tap.ReleaseNamespace}) if err != nil { return err } if len(pods) == 0 { - return fmt.Errorf("No %s pods found in namespace %s", misc.Software, config.Config.Tap.SelfNamespace) + return fmt.Errorf("No %s pods found in namespace %s", misc.Software, config.Config.Tap.ReleaseNamespace) } newZipFile, err := os.Create(filePath) @@ -60,17 +60,17 @@ func DumpLogs(ctx context.Context, provider *kubernetes.Provider, filePath strin } } - events, err := provider.GetNamespaceEvents(ctx, config.Config.Tap.SelfNamespace) + events, err := provider.GetNamespaceEvents(ctx, config.Config.Tap.ReleaseNamespace) if err != nil { log.Error().Err(err).Msg("Failed to get k8b events!") } else { - log.Debug().Str("namespace", config.Config.Tap.SelfNamespace).Msg("Successfully read events.") + log.Debug().Str("namespace", config.Config.Tap.ReleaseNamespace).Msg("Successfully read events.") } - if err := AddStrToZip(zipWriter, events, fmt.Sprintf("%s_events.log", config.Config.Tap.SelfNamespace)); err != nil { + if err := AddStrToZip(zipWriter, events, fmt.Sprintf("%s_events.log", config.Config.Tap.ReleaseNamespace)); err != nil { log.Error().Err(err).Msg("Failed write logs!") } else { - log.Debug().Str("namespace", config.Config.Tap.SelfNamespace).Msg("Successfully added events.") + log.Debug().Str("namespace", config.Config.Tap.ReleaseNamespace).Msg("Successfully added events.") } if err := AddFileToZip(zipWriter, config.ConfigFilePath); err != nil {