github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Regenerate golden files

pull/16495/head
Andrew Stucki 2023-03-01 17:20:10 -05:00
parent 29768f27aa
commit 1f26c2a6b4
12 changed files with 292 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
agent/xds/testdata/routes/connect-proxy-with-chain-and-failover-to-cluster-peer.latest.golden vendored
View File

@ -1,30 +1,31 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "db", "name": "db",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db", "name": "db",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "33s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

31
agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden vendored
View File

@ -1,30 +1,31 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "db", "name": "db",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db", "name": "db",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "78ebd528~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "78ebd528~db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "66s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

31
agent/xds/testdata/routes/connect-proxy-with-chain-and-redirect-to-cluster-peer.latest.golden vendored
View File

@ -1,30 +1,31 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "db", "name": "db",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db", "name": "db",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.cluster-01.external.peer1.domain" "cluster": "db.default.cluster-01.external.peer1.domain",
"timeout": "33s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

31
agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden vendored
View File

@ -1,30 +1,31 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "db", "name": "db",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db", "name": "db",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "33s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

31
agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden vendored
View File

@ -1,30 +1,31 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "db", "name": "db",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "db", "name": "db",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "33s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

46
agent/xds/testdata/routes/ingress-grpc-multiple-services.latest.golden vendored
View File

@ -1,50 +1,52 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "8080", "name": "8080",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"test1.example.com", "test1.example.com",
"test2.example.com", "test2.example.com",
"test2.example.com:8080", "test2.example.com:8080",
"test1.example.com:8080" "test1.example.com:8080"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
}, },
{ {
"name": "bar", "name": "bar",
"domains": [ "domains": [
"bar.ingress.*", "bar.ingress.*",
"bar.ingress.*:8080" "bar.ingress.*:8080"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

84
agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden vendored
View File

@ -1,91 +1,95 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "443", "name": "443",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "baz", "name": "baz",
"domains": [ "domains": [
"baz.ingress.*", "baz.ingress.*",
"baz.ingress.*:443" "baz.ingress.*:443"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "baz.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "baz.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "5s"
} }
} }
] ]
}, },
{ {
"name": "qux", "name": "qux",
"domains": [ "domains": [
"qux.ingress.*", "qux.ingress.*",
"qux.ingress.*:443" "qux.ingress.*:443"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "qux.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "qux.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "5s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
}, },
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "8080", "name": "8080",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"test1.example.com", "test1.example.com",
"test2.example.com", "test2.example.com",
"test2.example.com:8080", "test2.example.com:8080",
"test1.example.com:8080" "test1.example.com:8080"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
}, },
{ {
"name": "bar", "name": "bar",
"domains": [ "domains": [
"bar.ingress.*", "bar.ingress.*",
"bar.ingress.*:8080" "bar.ingress.*:8080"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

46
agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden vendored
View File

@ -1,48 +1,50 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191", "name": "9191",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "web", "name": "web",
"domains": [ "domains": [
"web.ingress.*", "web.ingress.*",
"web.ingress.*:9191" "web.ingress.*:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
}, },
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"foo.ingress.*", "foo.ingress.*",
"foo.ingress.*:9191" "foo.ingress.*:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

46
agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden vendored
View File

@ -1,48 +1,50 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191", "name": "9191",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "web", "name": "web",
"domains": [ "domains": [
"www.example.com", "www.example.com",
"www.example.com:9191" "www.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
}, },
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"foo.example.com", "foo.example.com",
"foo.example.com:9191" "foo.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

54
agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden vendored
View File

@ -1,55 +1,57 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191", "name": "9191",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"foo.example.com", "foo.example.com",
"foo.example.com:9191" "foo.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
}, },
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191_web", "name": "9191_web",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "web", "name": "web",
"domains": [ "domains": [
"www.example.com", "www.example.com",
"www.example.com:9191" "www.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

54
agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden vendored
View File

@ -1,55 +1,57 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191_foo", "name": "9191_foo",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"foo.example.com", "foo.example.com",
"foo.example.com:9191" "foo.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
}, },
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "9191_web", "name": "9191_web",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "web", "name": "web",
"domains": [ "domains": [
"www.example.com", "www.example.com",
"www.example.com:9191" "www.example.com:9191"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "22s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }

77
agent/xds/testdata/routes/mesh-gateway-with-exported-peered-services-http.latest.golden vendored
View File

@ -1,76 +1,79 @@
{ {
"versionInfo": "00000001", "versionInfo": "00000001",
"resources": [ "resources": [
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "bar", "name": "bar",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "bar", "name": "bar",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "exported~bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "5s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
}, },
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "foo", "name": "foo",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "foo", "name": "foo",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "exported~foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "5s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
}, },
{ {
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "gir", "name": "gir",
"virtualHosts": [ "virtualHosts": [
{ {
"name": "gir", "name": "gir",
"domains": [ "domains": [
"*" "*"
], ],
"routes": [ "routes": [
{ {
"match": { "match": {
"prefix": "/" "prefix": "/"
}, },
"route": { "route": {
"cluster": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" "cluster": "exported~gir.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"timeout": "5s"
} }
} }
] ]
} }
], ],
"validateClusters": true "validateClusters": true
} }
], ],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"nonce": "00000001" "nonce": "00000001"
} }