Skip to content

Commit

Permalink
disable Access Log Service for TCP Proxy (istio#16042)
Browse files Browse the repository at this point in the history
* test envoy als with ANY

Signed-off-by: Shriram Rajagopalan <[email protected]>

* Revert "test envoy als with ANY"

This reverts commit 4d55d9e.

* Update networkfilter.go

* nit

Signed-off-by: Shriram Rajagopalan <[email protected]>

* do not enable als for tcp

Signed-off-by: Shriram Rajagopalan <[email protected]>

* undo values.yaml

Signed-off-by: Shriram Rajagopalan <[email protected]>
  • Loading branch information
rshriram authored and istio-testing committed Aug 6, 2019
1 parent fefbf51 commit 40ff852
Showing 1 changed file with 1 addition and 29 deletions.
30 changes: 1 addition & 29 deletions pilot/pkg/networking/core/v1alpha3/networkfilter.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"fmt"
"time"

"github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
"github.com/envoyproxy/go-control-plane/envoy/api/v2/listener"
accesslogconfig "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2"
accesslog "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
Expand All @@ -38,8 +37,6 @@ import (
"istio.io/istio/pkg/config/protocol"
)

const tcpEnvoyAccesslogName string = "tcp_envoy_accesslog"

// redisOpTimeout is the default operation timeout for the Redis proxy filter.
var redisOpTimeout = 5 * time.Second

Expand Down Expand Up @@ -76,32 +73,7 @@ func setAccessLog(env *model.Environment, node *model.Proxy, config *tcp_proxy.T
config.AccessLog = append(config.AccessLog, acc)
}

if env.Mesh.EnableEnvoyAccessLogService {
fl := &accesslogconfig.TcpGrpcAccessLogConfig{
CommonConfig: &accesslogconfig.CommonGrpcAccessLogConfig{
LogName: tcpEnvoyAccesslogName,
GrpcService: &core.GrpcService{
TargetSpecifier: &core.GrpcService_EnvoyGrpc_{
EnvoyGrpc: &core.GrpcService_EnvoyGrpc{
ClusterName: EnvoyAccessLogCluster,
},
},
},
},
}

acc := &accesslog.AccessLog{
Name: xdsutil.HTTPGRPCAccessLog,
}

if util.IsXDSMarshalingToAnyEnabled(node) {
acc.ConfigType = &accesslog.AccessLog_TypedConfig{TypedConfig: util.MessageToAny(fl)}
} else {
acc.ConfigType = &accesslog.AccessLog_Config{Config: util.MessageToStruct(fl)}
}

config.AccessLog = append(config.AccessLog, acc)
}
// envoy als is not enabled for tcp
return config
}

Expand Down

0 comments on commit 40ff852

Please sign in to comment.