diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 2b26bfd73..4bc72d3a3 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -151,17 +151,18 @@ func printTappedPodsPreview(ctx context.Context, kubernetesProvider *kubernetes. } } -func startTapperSyncer(ctx context.Context, cancel context.CancelFunc, provider *kubernetes.Provider, targetNamespaces []string, mizuApiFilteringOptions api.TrafficFilteringOptions, startTime time.Time) error { +func startTapperSyncer(ctx context.Context, cancel context.CancelFunc, provider *kubernetes.Provider, targetNamespaces []string, startTime time.Time) error { tapperSyncer, err := kubernetes.CreateAndStartMizuTapperSyncer(ctx, provider, kubernetes.TapperSyncerConfig{ - TargetNamespaces: targetNamespaces, - PodFilterRegex: *config.Config.Tap.PodRegex(), - MizuResourcesNamespace: config.Config.MizuResourcesNamespace, - AgentImage: config.Config.AgentImage, - TapperResources: config.Config.Tap.TapperResources, - ImagePullPolicy: config.Config.ImagePullPolicy(), - LogLevel: config.Config.LogLevel(), - IgnoredUserAgents: config.Config.Tap.IgnoredUserAgents, - MizuApiFilteringOptions: mizuApiFilteringOptions, + TargetNamespaces: targetNamespaces, + PodFilterRegex: *config.Config.Tap.PodRegex(), + MizuResourcesNamespace: config.Config.MizuResourcesNamespace, + AgentImage: config.Config.AgentImage, + TapperResources: config.Config.Tap.TapperResources, + ImagePullPolicy: config.Config.ImagePullPolicy(), + LogLevel: config.Config.LogLevel(), + MizuApiFilteringOptions: api.TrafficFilteringOptions{ + IgnoredUserAgents: config.Config.Tap.IgnoredUserAgents, + }, MizuServiceAccountExists: state.mizuServiceAccountExists, ServiceMesh: config.Config.Tap.ServiceMesh, Tls: config.Config.Tap.Tls, @@ -229,12 +230,6 @@ func getErrorDisplayTextForK8sTapManagerError(err kubernetes.K8sTapManagerError) } } -func getMizuApiFilteringOptions() (*api.TrafficFilteringOptions, error) { - return &api.TrafficFilteringOptions{ - IgnoredUserAgents: config.Config.Tap.IgnoredUserAgents, - }, nil -} - func watchApiServerPod(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { podExactRegex := regexp.MustCompile(fmt.Sprintf("^%s$", kubernetes.ApiServerPodName)) podWatchHelper := kubernetes.NewPodWatchHelper(kubernetesProvider, podExactRegex) @@ -352,8 +347,7 @@ func watchApiServerEvents(ctx context.Context, kubernetesProvider *kubernetes.Pr func postApiServerStarted(ctx context.Context, kubernetesProvider *kubernetes.Provider, cancel context.CancelFunc) { startProxyReportErrorIfAny(kubernetesProvider, ctx, cancel, config.Config.Tap.GuiPort) - options, _ := getMizuApiFilteringOptions() - if err := startTapperSyncer(ctx, cancel, kubernetesProvider, state.targetNamespaces, *options, state.startTime); err != nil { + if err := startTapperSyncer(ctx, cancel, kubernetesProvider, state.targetNamespaces, state.startTime); err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error starting mizu tapper syncer: %v", errormessage.FormatError(err))) cancel() } diff --git a/shared/kubernetes/mizuTapperSyncer.go b/shared/kubernetes/mizuTapperSyncer.go index d996665a4..c0e8ef8c3 100644 --- a/shared/kubernetes/mizuTapperSyncer.go +++ b/shared/kubernetes/mizuTapperSyncer.go @@ -43,7 +43,6 @@ type TapperSyncerConfig struct { TapperResources shared.Resources ImagePullPolicy core.PullPolicy LogLevel logging.Level - IgnoredUserAgents []string MizuApiFilteringOptions api.TrafficFilteringOptions MizuServiceAccountExists bool ServiceMesh bool