github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 15:25:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98456 from SataQiu/fix-apiserver-log-20210127

Browse Source 
Fix the bug that network proxy logging http-connect mode in all cases
This commit is contained in:
Kubernetes Prow Robot 2021-01-27 16:59:07 -08:00 committed by GitHub
commit b3dd01da49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apiserver/pkg/server/egressselector/egress_selector.go
View File

@ -226,7 +226,7 @@ func (d *dialerCreator) createDialer() utilnet.DialFunc {
return directDialer return directDialer
} }
return func(ctx context.Context, network, addr string) (net.Conn, error) { return func(ctx context.Context, network, addr string) (net.Conn, error) {
trace := utiltrace.New(fmt.Sprintf("Proxy via HTTP Connect over %s", d.options.transport), utiltrace.Field{Key: "address", Value: addr}) trace := utiltrace.New(fmt.Sprintf("Proxy via %s protocol over %s", d.options.protocol, d.options.transport), utiltrace.Field{Key: "address", Value: addr})
defer trace.LogIfLong(500 * time.Millisecond) defer trace.LogIfLong(500 * time.Millisecond)
start := egressmetrics.Metrics.Clock().Now() start := egressmetrics.Metrics.Clock().Now()
proxier, err := d.connector.connect() proxier, err := d.connector.connect()