Skip to content

Commit 30179a0

Browse files
zhaohuabingzhaohuabing
committed
rename listener using its address and port
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
1 parent 0ca5abd commit 30179a0

File tree

198 files changed

+299
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+299
-299
lines changed

‎internal/cmd/egctl/testdata/translate/out/default-resources.all.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ xds:
11261126
useRemoteAddress: true
11271127
name: default/eg/http
11281128
maxConnectionsToAcceptPerSocketEvent: 1
1129-
name: default/eg/http
1129+
name: 0.0.0.0-10080
11301130
perConnectionBufferLimitBytes: 32768
11311131
- activeState:
11321132
listener:
@@ -1238,7 +1238,7 @@ xds:
12381238
useRemoteAddress: true
12391239
name: default/eg/grpc
12401240
maxConnectionsToAcceptPerSocketEvent: 1
1241-
name: default/eg/grpc
1241+
name: 0.0.0.0-8080
12421242
perConnectionBufferLimitBytes: 32768
12431243
- activeState:
12441244
listener:
@@ -1322,7 +1322,7 @@ xds:
13221322
statPrefix: tcp-1234
13231323
name: tcproute/default/backend
13241324
maxConnectionsToAcceptPerSocketEvent: 1
1325-
name: default/eg/tcp
1325+
name: 0.0.0.0-1234
13261326
perConnectionBufferLimitBytes: 32768
13271327
- activeState:
13281328
listener:
@@ -1413,7 +1413,7 @@ xds:
14131413
typedConfig:
14141414
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
14151415
maxConnectionsToAcceptPerSocketEvent: 1
1416-
name: default/eg/tls-passthrough
1416+
name: 0.0.0.0-8443
14171417
perConnectionBufferLimitBytes: 32768
14181418
- activeState:
14191419
listener:

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@
978978
"name": "default/eg/http"
979979
},
980980
"maxConnectionsToAcceptPerSocketEvent": 1,
981-
"name": "default/eg/http",
981+
"name": "0.0.0.0-10080",
982982
"perConnectionBufferLimitBytes": 32768
983983
}
984984
}
@@ -1130,7 +1130,7 @@
11301130
"name": "default/eg/grpc"
11311131
},
11321132
"maxConnectionsToAcceptPerSocketEvent": 1,
1133-
"name": "default/eg/grpc",
1133+
"name": "0.0.0.0-8080",
11341134
"perConnectionBufferLimitBytes": 32768
11351135
}
11361136
}
@@ -1242,7 +1242,7 @@
12421242
}
12431243
],
12441244
"maxConnectionsToAcceptPerSocketEvent": 1,
1245-
"name": "default/eg/tcp",
1245+
"name": "0.0.0.0-1234",
12461246
"perConnectionBufferLimitBytes": 32768
12471247
}
12481248
}
@@ -1367,7 +1367,7 @@
13671367
}
13681368
],
13691369
"maxConnectionsToAcceptPerSocketEvent": 1,
1370-
"name": "default/eg/tls-passthrough",
1370+
"name": "0.0.0.0-8443",
13711371
"perConnectionBufferLimitBytes": 32768
13721372
}
13731373
}

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.all.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ xds:
579579
useRemoteAddress: true
580580
name: default/eg/http
581581
maxConnectionsToAcceptPerSocketEvent: 1
582-
name: default/eg/http
582+
name: 0.0.0.0-10080
583583
perConnectionBufferLimitBytes: 32768
584584
- activeState:
585585
listener:
@@ -691,7 +691,7 @@ xds:
691691
useRemoteAddress: true
692692
name: default/eg/grpc
693693
maxConnectionsToAcceptPerSocketEvent: 1
694-
name: default/eg/grpc
694+
name: 0.0.0.0-8080
695695
perConnectionBufferLimitBytes: 32768
696696
- activeState:
697697
listener:
@@ -775,7 +775,7 @@ xds:
775775
statPrefix: tcp-1234
776776
name: tcproute/default/backend
777777
maxConnectionsToAcceptPerSocketEvent: 1
778-
name: default/eg/tcp
778+
name: 0.0.0.0-1234
779779
perConnectionBufferLimitBytes: 32768
780780
- activeState:
781781
listener:
@@ -866,7 +866,7 @@ xds:
866866
typedConfig:
867867
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
868868
maxConnectionsToAcceptPerSocketEvent: 1
869-
name: default/eg/tls-passthrough
869+
name: 0.0.0.0-8443
870870
perConnectionBufferLimitBytes: 32768
871871
- activeState:
872872
listener:

‎internal/cmd/egctl/testdata/translate/out/from-gateway-api-to-xds.listener.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ xds:
143143
useRemoteAddress: true
144144
name: default/eg/http
145145
maxConnectionsToAcceptPerSocketEvent: 1
146-
name: default/eg/http
146+
name: 0.0.0.0-10080
147147
perConnectionBufferLimitBytes: 32768
148148
- activeState:
149149
listener:
@@ -255,7 +255,7 @@ xds:
255255
useRemoteAddress: true
256256
name: default/eg/grpc
257257
maxConnectionsToAcceptPerSocketEvent: 1
258-
name: default/eg/grpc
258+
name: 0.0.0.0-8080
259259
perConnectionBufferLimitBytes: 32768
260260
- activeState:
261261
listener:
@@ -339,7 +339,7 @@ xds:
339339
statPrefix: tcp-1234
340340
name: tcproute/default/backend
341341
maxConnectionsToAcceptPerSocketEvent: 1
342-
name: default/eg/tcp
342+
name: 0.0.0.0-1234
343343
perConnectionBufferLimitBytes: 32768
344344
- activeState:
345345
listener:
@@ -430,7 +430,7 @@ xds:
430430
typedConfig:
431431
'@type': type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector
432432
maxConnectionsToAcceptPerSocketEvent: 1
433-
name: default/eg/tls-passthrough
433+
name: 0.0.0.0-8443
434434
perConnectionBufferLimitBytes: 32768
435435
- activeState:
436436
listener:

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@
689689
"name": "envoy-gateway-system/eg/http"
690690
},
691691
"maxConnectionsToAcceptPerSocketEvent": 1,
692-
"name": "envoy-gateway-system/eg/http",
692+
"name": "0.0.0.0-10080",
693693
"perConnectionBufferLimitBytes": 32768
694694
}
695695
}

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ xds:
417417
useRemoteAddress: true
418418
name: envoy-gateway-system/eg/http
419419
maxConnectionsToAcceptPerSocketEvent: 1
420-
name: envoy-gateway-system/eg/http
420+
name: 0.0.0.0-10080
421421
perConnectionBufferLimitBytes: 32768
422422
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
423423
dynamicRouteConfigs:

‎internal/cmd/egctl/testdata/translate/out/jwt-single-route-single-match-to-xds.listener.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,5 +163,5 @@ xds:
163163
useRemoteAddress: true
164164
name: envoy-gateway-system/eg/http
165165
maxConnectionsToAcceptPerSocketEvent: 1
166-
name: envoy-gateway-system/eg/http
166+
name: 0.0.0.0-10080
167167
perConnectionBufferLimitBytes: 32768

‎internal/cmd/egctl/testdata/translate/out/no-service-cluster-ip.all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ xds:
352352
useRemoteAddress: true
353353
name: envoy-gateway-system/eg/http
354354
maxConnectionsToAcceptPerSocketEvent: 1
355-
name: envoy-gateway-system/eg/http
355+
name: 0.0.0.0-10080
356356
perConnectionBufferLimitBytes: 32768
357357
- '@type': type.googleapis.com/envoy.admin.v3.RoutesConfigDump
358358
dynamicRouteConfigs:

‎internal/xds/translator/extensionserver_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,19 +180,19 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req *
180180
// Only make the change when the listener's name matches the expected testdata
181181
// This prevents us from having to update every single testfile.out
182182
switch req.Listener.Name {
183-
case "extension-post-xdslistener-hook-error":
183+
case "0.0.0.0-10181": // "extension-post-xdslistener-hook-error"
184184
return &pb.PostHTTPListenerModifyResponse{
185185
Listener: req.Listener,
186186
}, fmt.Errorf("extension post xds listener hook error")
187-
case "extension-listener":
187+
case "0.0.0.0-10182": // "extension-listener"
188188
// Setup a new Listener to avoid operating directly on the passed in pointer for better test coverage that the
189189
// Listener we are returning gets used properly
190190
modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener)
191191
modifiedListener.StatPrefix = "mock-extension-inserted-prefix"
192192
return &pb.PostHTTPListenerModifyResponse{
193193
Listener: modifiedListener,
194194
}, nil
195-
case "policyextension-listener":
195+
case "0.0.0.0-10183": // "policyextension-listener"
196196
if len(req.PostListenerContext.ExtensionResources) == 0 {
197197
return nil, fmt.Errorf("expected a policy in the ext array")
198198
}
@@ -219,7 +219,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req *
219219
return &pb.PostHTTPListenerModifyResponse{
220220
Listener: modifiedListener,
221221
}, nil
222-
case "envoy-gateway/gateway-1/http1":
222+
case "0.0.0.0-10184": // "envoy-gateway/gateway-1/http1"
223223
if len(req.PostListenerContext.ExtensionResources) != 1 {
224224
return &pb.PostHTTPListenerModifyResponse{
225225
Listener: req.Listener,
@@ -231,7 +231,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req *
231231
return &pb.PostHTTPListenerModifyResponse{
232232
Listener: modifiedListener,
233233
}, nil
234-
case "envoy-gateway/gateway-1/tcp1":
234+
case "0.0.0.0-10185": // "envoy-gateway/gateway-1/tcp1"
235235
return &pb.PostHTTPListenerModifyResponse{
236236
Listener: req.Listener,
237237
}, fmt.Errorf("should not be called for this listener, test 'extensionpolicy-tcp-and-http' should merge tcp and http gateways to one listener")
@@ -247,7 +247,7 @@ func (t *testingExtensionServer) PostHTTPListenerModify(_ context.Context, req *
247247
return &pb.PostHTTPListenerModifyResponse{
248248
Listener: modifiedListener,
249249
}, nil
250-
case "first-listener-error":
250+
case "::-10186": // "first-listener-error"
251251
modifiedListener := proto.Clone(req.Listener).(*listenerV3.Listener)
252252
modifiedListener.StatPrefix = req.Listener.Name
253253
return &pb.PostHTTPListenerModifyResponse{

‎internal/xds/translator/listener.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ package translator
77

88
import (
99
"errors"
10+
"fmt"
1011
"net"
1112
"strconv"
1213
"strings"
@@ -185,7 +186,7 @@ func originalIPDetectionExtensions(clientIPDetection *ir.ClientIPDetectionSettin
185186
// buildXdsTCPListener creates a xds Listener resource
186187
// TODO: Improve function parameters
187188
func buildXdsTCPListener(
188-
name, address string,
189+
address string,
189190
port uint32,
190191
ipFamily *egv1a1.IPFamily,
191192
keepalive *ir.TCPKeepalive,
@@ -200,7 +201,7 @@ func buildXdsTCPListener(
200201
bufferLimitBytes := buildPerConnectionBufferLimitBytes(connection)
201202
maxAcceptPerSocketEvent := buildMaxAcceptPerSocketEvent(connection)
202203
listener := &listenerv3.Listener{
203-
Name: name,
204+
Name: tcpListenerName(address, port),
204205
AccessLog: al,
205206
SocketOptions: socketOptions,
206207
PerConnectionBufferLimitBytes: bufferLimitBytes,
@@ -226,6 +227,10 @@ func buildXdsTCPListener(
226227
return listener, nil
227228
}
228229

230+
func tcpListenerName(address string, port uint32) string {
231+
return fmt.Sprintf("%s-%d", address, port)
232+
}
233+
229234
func buildPerConnectionBufferLimitBytes(connection *ir.ClientConnection) *wrapperspb.UInt32Value {
230235
if connection != nil && connection.BufferLimitBytes != nil {
231236
return wrapperspb.UInt32(*connection.BufferLimitBytes)

0 commit comments

Comments
 (0)