luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Update golden files after default route fix for tgw

This commit is contained in:
freddygv 2020-09-03 12:35:11 -06:00
parent 23147c1d5b
commit b149185794
4 changed files with 264 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-12-x.golden vendored
View File

@ -3,10 +3,10 @@
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -16,7 +16,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -26,10 +45,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -39,7 +58,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -49,10 +87,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -62,7 +100,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]

75
agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-13-x.golden vendored
View File

@ -3,10 +3,10 @@
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -16,7 +16,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -26,10 +45,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -39,7 +58,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -49,10 +87,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -62,7 +100,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]

75
agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-14-x.golden vendored
View File

@ -3,10 +3,10 @@
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -16,7 +16,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -26,10 +45,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -39,7 +58,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -49,10 +87,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -62,7 +100,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]

75
agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-15-x.golden vendored
View File

@ -3,10 +3,10 @@
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -16,7 +16,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -26,10 +45,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -39,7 +58,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]
@ -49,10 +87,10 @@
}, },
{ {
"@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration", "@type": "type.googleapis.com/envoy.api.v2.RouteConfiguration",
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [ "domains": [
"*" "*"
], ],
@ -62,7 +100,26 @@
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
} }
} }
] ]