diff --git a/agent/main.go b/agent/main.go index d3ef37458..7da612d86 100644 --- a/agent/main.go +++ b/agent/main.go @@ -42,20 +42,20 @@ var extensionsMap map[string]*tapApi.Extension // global func main() { flag.Parse() loadExtensions() - hostMode := os.Getenv(shared.HostModeEnvVar) == "1" - tapOpts := &tap.TapOpts{HostMode: hostMode} if !*tapperMode && !*apiServerMode && !*standaloneMode && !*harsReaderMode { panic("One of the flags --tap, --api or --standalone or --hars-read must be provided") } - filteringOptions := getTrafficFilteringOptions() - if *standaloneMode { api.StartResolving(*namespace) outputItemsChannel := make(chan *tapApi.OutputChannelItem) filteredOutputItemsChannel := make(chan *tapApi.OutputChannelItem) + + filteringOptions := getTrafficFilteringOptions() + hostMode := os.Getenv(shared.HostModeEnvVar) == "1" + tapOpts := &tap.TapOpts{HostMode: hostMode} tap.StartPassiveTapper(tapOpts, outputItemsChannel, extensions, filteringOptions) go filterItems(outputItemsChannel, filteredOutputItemsChannel) @@ -75,6 +75,10 @@ func main() { } filteredOutputItemsChannel := make(chan *tapApi.OutputChannelItem) + + filteringOptions := getTrafficFilteringOptions() + hostMode := os.Getenv(shared.HostModeEnvVar) == "1" + tapOpts := &tap.TapOpts{HostMode: hostMode} tap.StartPassiveTapper(tapOpts, filteredOutputItemsChannel, extensions, filteringOptions) socketConnection, _, err := websocket.DefaultDialer.Dial(*apiServerAddress, nil) if err != nil { diff --git a/cli/cmd/tapRunner.go b/cli/cmd/tapRunner.go index 8046b041d..922c372ed 100644 --- a/cli/cmd/tapRunner.go +++ b/cli/cmd/tapRunner.go @@ -103,7 +103,7 @@ func RunMizuTap() { } defer finishMizuExecution(kubernetesProvider) - if err := createMizuResources(ctx, kubernetesProvider, mizuApiFilteringOptions, mizuValidationRules); err != nil { + if err := createMizuResources(ctx, kubernetesProvider, mizuValidationRules); err != nil { logger.Log.Errorf(uiUtils.Error, fmt.Sprintf("Error creating resources: %v", errormessage.FormatError(err))) return } @@ -125,14 +125,14 @@ func readValidationRules(file string) (string, error) { return string(newContent), nil } -func createMizuResources(ctx context.Context, kubernetesProvider *kubernetes.Provider, mizuApiFilteringOptions *api.TrafficFilteringOptions, mizuValidationRules string) error { +func createMizuResources(ctx context.Context, kubernetesProvider *kubernetes.Provider, mizuValidationRules string) error { if !config.Config.IsNsRestrictedMode() { if err := createMizuNamespace(ctx, kubernetesProvider); err != nil { return err } } - if err := createMizuApiServer(ctx, kubernetesProvider, mizuApiFilteringOptions); err != nil { + if err := createMizuApiServer(ctx, kubernetesProvider); err != nil { return err } @@ -153,7 +153,7 @@ func createMizuNamespace(ctx context.Context, kubernetesProvider *kubernetes.Pro return err } -func createMizuApiServer(ctx context.Context, kubernetesProvider *kubernetes.Provider, mizuApiFilteringOptions *api.TrafficFilteringOptions) error { +func createMizuApiServer(ctx context.Context, kubernetesProvider *kubernetes.Provider) error { var err error state.mizuServiceAccountExists, err = createRBACIfNecessary(ctx, kubernetesProvider) @@ -174,7 +174,6 @@ func createMizuApiServer(ctx context.Context, kubernetesProvider *kubernetes.Pro PodImage: config.Config.AgentImage, ServiceAccountName: serviceAccountName, IsNamespaceRestricted: config.Config.IsNsRestrictedMode(), - MizuApiFilteringOptions: mizuApiFilteringOptions, SyncEntriesConfig: getSyncEntriesConfig(), MaxEntriesDBSizeBytes: config.Config.Tap.MaxEntriesDBSizeBytes(), Resources: config.Config.Tap.ApiServerResources, diff --git a/cli/kubernetes/provider.go b/cli/kubernetes/provider.go index 9d5c2dce3..512548605 100644 --- a/cli/kubernetes/provider.go +++ b/cli/kubernetes/provider.go @@ -151,7 +151,6 @@ type ApiServerOptions struct { PodImage string ServiceAccountName string IsNamespaceRestricted bool - MizuApiFilteringOptions *api.TrafficFilteringOptions SyncEntriesConfig *shared.SyncEntriesConfig MaxEntriesDBSizeBytes int64 Resources configStructs.Resources @@ -159,15 +158,10 @@ type ApiServerOptions struct { } func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiServerOptions) (*core.Pod, error) { - marshaledFilteringOptions, err := json.Marshal(opts.MizuApiFilteringOptions) - if err != nil { - return nil, err - } - var marshaledSyncEntriesConfig []byte if opts.SyncEntriesConfig != nil { - marshaledSyncEntriesConfig, err = json.Marshal(opts.SyncEntriesConfig) - if err != nil { + var err error + if marshaledSyncEntriesConfig, err = json.Marshal(opts.SyncEntriesConfig); err != nil { return nil, err } } @@ -219,14 +213,6 @@ func (provider *Provider) CreateMizuApiServerPod(ctx context.Context, opts *ApiS }, Command: command, Env: []core.EnvVar{ - { - Name: shared.HostModeEnvVar, - Value: "1", - }, - { - Name: shared.MizuFilteringOptionsEnvVar, - Value: string(marshaledFilteringOptions), - }, { Name: shared.SyncEntriesConfigEnvVar, Value: string(marshaledSyncEntriesConfig),