remove upstream filters on the router filter (#10731)

Author: yuval-k

internal/kgateway/extensions2/plugins/directresponse/direct_response_plugin.go

@@ -159,10 +159,6 @@ func (p *directResponsePluginGwPass) HttpFilters(ctx context.Context, fcc ir.Fil
 	return nil, nil
 }
 
-func (p *directResponsePluginGwPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
-
 func (p *directResponsePluginGwPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/extensions2/plugins/httplistenerpolicy/httplistener_plugin.go

@@ -165,10 +165,6 @@ func (p *httpListenerPolicyPluginGwPass) HttpFilters(ctx context.Context, fcc ir
 	return nil, nil
 }
 
-func (p *httpListenerPolicyPluginGwPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
-
 func (p *httpListenerPolicyPluginGwPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/extensions2/plugins/listenerpolicy/listener_policy_plugin.go

@@ -137,10 +137,6 @@ func (p *listenerPolicyPluginGwPass) HttpFilters(ctx context.Context, fcc ir.Fil
 	return nil, nil
 }
 
-func (p *listenerPolicyPluginGwPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
-
 func (p *listenerPolicyPluginGwPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/extensions2/plugins/routepolicy/route_policy_plugin.go

@@ -132,10 +132,6 @@ func (p *routePolicyPluginGwPass) HttpFilters(ctx context.Context, fcc ir.Filter
 	return nil, nil
 }
 
-func (p *routePolicyPluginGwPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
-
 func (p *routePolicyPluginGwPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/ir/iface.go

@@ -88,7 +88,6 @@ type ProxyTranslationPass interface {
 	// if a plugin emits new filters, they must be with a plugin unique name.
 	// any filter returned from route config must be disabled, so it doesnt impact other routes.
 	HttpFilters(ctx context.Context, fc FilterChainCommon) ([]plugins.StagedHttpFilter, error)
-	UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error)
 
 	NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error)
 	// called 1 time (per envoy proxy). replaces GeneratedResources
@@ -118,9 +117,6 @@ func (s UnimplementedProxyTranslationPass) ApplyForRouteBackend(ctx context.Cont
 func (s UnimplementedProxyTranslationPass) HttpFilters(ctx context.Context, fc FilterChainCommon) ([]plugins.StagedHttpFilter, error) {
 	return nil, nil
 }
-func (s UnimplementedProxyTranslationPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
 func (s UnimplementedProxyTranslationPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/krtcollections/builtin.go

@@ -420,10 +420,6 @@ func (p *builtinPluginGwPass) HttpFilters(ctx context.Context, fcc ir.FilterChai
 	return nil, nil
 }
 
-func (p *builtinPluginGwPass) UpstreamHttpFilters(ctx context.Context) ([]plugins.StagedUpstreamHttpFilter, error) {
-	return nil, nil
-}
-
 func (p *builtinPluginGwPass) NetworkFilters(ctx context.Context) ([]plugins.StagedNetworkFilter, error) {
 	return nil, nil
 }

internal/kgateway/translator/irtranslator/fc.go

@@ -8,7 +8,6 @@ import (
 	envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
 	envoy_config_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
 	routerv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
-	codecv3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/upstream_codec/v3"
 	envoyhttp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
 	envoytcp "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
 	envoyauth "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
@@ -305,8 +304,6 @@ func (h *hcmNetworkFilterTranslator) computeHttpFilters(ctx context.Context, l i
 	// as the terminal filter in kgateway.
 	routerV3 := routerv3.Router{}
 
-	h.computeUpstreamHTTPFilters(ctx, l, &routerV3)
-
 	//	// TODO it would be ideal of SuppressEnvoyHeaders and DynamicStats could be moved out of here set
 	//	// in a separate router plugin
 	//	if h.listener.GetOptions().GetRouter().GetSuppressEnvoyHeaders().GetValue() {
@@ -335,62 +332,6 @@ func (h *hcmNetworkFilterTranslator) computeHttpFilters(ctx context.Context, l i
 	return envoyHttpFilters
 }
 
-func (h *hcmNetworkFilterTranslator) computeUpstreamHTTPFilters(ctx context.Context, l ir.HttpFilterChainIR, routerV3 *routerv3.Router) {
-	upstreamHttpFilters := plugins.StagedUpstreamHttpFilterList{}
-	log := contextutils.LoggerFrom(ctx).Desugar()
-	for _, plug := range h.PluginPass {
-		stagedFilters, err := plug.UpstreamHttpFilters(ctx)
-		if err != nil {
-			// what to do with errors here? ignore the listener??
-			h.reporter.SetCondition(reports.ListenerCondition{
-				Type:    gwv1.ListenerConditionProgrammed,
-				Reason:  gwv1.ListenerReasonInvalid,
-				Status:  metav1.ConditionFalse,
-				Message: "Error processing upstream http plugin: " + err.Error(),
-			})
-			// TODO: return false?
-		}
-		for _, httpFilter := range stagedFilters {
-			if httpFilter.Filter == nil {
-				log.Warn("HttpFilters() returned nil", zap.String("name", plug.Name))
-				continue
-			}
-			upstreamHttpFilters = append(upstreamHttpFilters, httpFilter)
-		}
-	}
-
-	if len(upstreamHttpFilters) == 0 {
-		return
-	}
-
-	sort.Sort(upstreamHttpFilters)
-
-	sortedFilters := make([]*envoyhttp.HttpFilter, len(upstreamHttpFilters))
-	for i, filter := range upstreamHttpFilters {
-		sortedFilters[i] = filter.Filter
-	}
-
-	msg, err := anypb.New(&codecv3.UpstreamCodec{})
-	if err != nil {
-		// what to do with errors here? ignore the listener??
-		h.reporter.SetCondition(reports.ListenerCondition{
-			Type:    gwv1.ListenerConditionProgrammed,
-			Reason:  gwv1.ListenerReasonInvalid,
-			Status:  metav1.ConditionFalse,
-			Message: "failed to convert proto message to any: " + err.Error(),
-		})
-		return
-	}
-
-	routerV3.UpstreamHttpFilters = sortedFilters
-	routerV3.UpstreamHttpFilters = append(routerV3.GetUpstreamHttpFilters(), &envoyhttp.HttpFilter{
-		Name: UpstreamCodeFilterName,
-		ConfigType: &envoyhttp.HttpFilter_TypedConfig{
-			TypedConfig: msg,
-		},
-	})
-}
-
 func sortHttpFilters(filters plugins.StagedHttpFilterList) []*envoyhttp.HttpFilter {
 	sort.Sort(filters)
 	var sortedFilters []*envoyhttp.HttpFilter