Skip to content

Commit 42a6acf

Browse files
committed
fix gen
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
1 parent c96448e commit 42a6acf

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

internal/gatewayapi/testdata/securitypolicy-with-extauth-backendrefs.out.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ xdsIR:
238238
- path: /dev/stdout
239239
http:
240240
- address: 0.0.0.0
241+
externalPort: 80
241242
hostnames:
242243
- '*'
243244
isHTTP2: false

internal/gatewayapi/testdata/securitypolicy-with-oidc-backendrefs.out.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ xdsIR:
206206
- path: /dev/stdout
207207
http:
208208
- address: 0.0.0.0
209+
externalPort: 80
209210
hostnames:
210211
- '*'
211212
isHTTP2: false

internal/xds/translator/translator.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -489,13 +489,6 @@ func (t *Translator) addRouteToRouteConfig(
489489
err error
490490
)
491491

492-
// If the virtual host already exists, we can skip it.
493-
for _, vHost := range xdsRouteCfg.VirtualHosts {
494-
if vHost.Name == virtualHostName(httpListener, vHost.Domains[0]) {
495-
vHosts[vHost.Domains[0]] = vHost
496-
}
497-
}
498-
499492
// Check if an extension is loaded that wants to modify xDS Routes after they have been generated
500493
for _, httpRoute := range httpListener.Routes {
501494
// 1:1 between IR HTTPRoute Hostname and xDS VirtualHost.
@@ -825,7 +818,7 @@ func (t *Translator) processTCPListenerXdsTranslation(
825818
return errs
826819
}
827820

828-
func (t *Translator) processUDPListenerXdsTranslation(
821+
func(t *Translator) processUDPListenerXdsTranslation(
829822
tCtx *types.ResourceVersionTable,
830823
udpListeners []*ir.UDPListener,
831824
accesslog *ir.AccessLog,

test/e2e/tests/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ func IsGatewayNamespaceMode() bool {
736736

737737
// TODO(zhaohuabing) remove this after the feature flag is removed.
738738
func XDSNameSchemeV2() bool {
739-
return DeployProfile == "pxds-name-scheme-v2"
739+
return DeployProfile == "xds-name-scheme-v2"
740740
}
741741

742742
func GetGatewayResourceNamespace() string {

0 commit comments

Comments
 (0)