-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into add-checks-apigw-creation-no-routes
- Loading branch information
Showing
11 changed files
with
540 additions
and
300 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ```release-note:bug | ||
| gateways: Fixes a bug API gateways using HTTP listeners were taking upwards of 15 seconds to get configured over xDS. | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
agent/xds/testdata/clusters/api-gateway-with-http-route-and-inline-certificate.latest.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| { | ||
| "versionInfo": "00000001", | ||
| "resources": [ | ||
| { | ||
| "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster", | ||
| "name": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", | ||
| "altStatName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", | ||
| "type": "EDS", | ||
| "edsClusterConfig": { | ||
| "edsConfig": { | ||
| "ads": {}, | ||
| "resourceApiVersion": "V3" | ||
| } | ||
| }, | ||
| "connectTimeout": "5s", | ||
| "circuitBreakers": {}, | ||
| "outlierDetection": {}, | ||
| "commonLbConfig": { | ||
| "healthyPanicThreshold": {} | ||
| }, | ||
| "transportSocket": { | ||
| "name": "tls", | ||
| "typedConfig": { | ||
| "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext", | ||
| "commonTlsContext": { | ||
| "tlsParams": {}, | ||
| "tlsCertificates": [ | ||
| { | ||
| "certificateChain": { | ||
| "inlineString": "-----BEGIN CERTIFICATE-----\nMIICjDCCAjKgAwIBAgIIC5llxGV1gB8wCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowDjEMMAoG\nA1UEAxMDd2ViMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEADPv1RHVNRfa2VKR\nAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Favq5E0ivpNtv1QnFhxtPd7d5k4e+T7\nSkW1TaOCAXIwggFuMA4GA1UdDwEB/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcD\nAgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADBoBgNVHQ4EYQRfN2Q6MDc6ODc6M2E6\nNDA6MTk6NDc6YzM6NWE6YzA6YmE6NjI6ZGY6YWY6NGI6ZDQ6MDU6MjU6NzY6M2Q6\nNWE6OGQ6MTY6OGQ6Njc6NWU6MmU6YTA6MzQ6N2Q6ZGM6ZmYwagYDVR0jBGMwYYBf\nZDE6MTE6MTE6YWM6MmE6YmE6OTc6YjI6M2Y6YWM6N2I6YmQ6ZGE6YmU6YjE6OGE6\nZmM6OWE6YmE6YjU6YmM6ODM6ZTc6NWU6NDE6NmY6ZjI6NzM6OTU6NTg6MGM6ZGIw\nWQYDVR0RBFIwUIZOc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9ucy9kZWZhdWx0L2RjL2RjMS9zdmMvd2ViMAoGCCqG\nSM49BAMCA0gAMEUCIGC3TTvvjj76KMrguVyFf4tjOqaSCRie3nmHMRNNRav7AiEA\npY0heYeK9A6iOLrzqxSerkXXQyj5e9bE4VgUnxgPU6g=\n-----END CERTIFICATE-----\n" | ||
| }, | ||
| "privateKey": { | ||
| "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIMoTkpRggp3fqZzFKh82yS4LjtJI+XY+qX/7DefHFrtdoAoGCCqGSM49\nAwEHoUQDQgAEADPv1RHVNRfa2VKRAB16b6rZnEt7tuhaxCFpQXPj7M2omb0B9Fav\nq5E0ivpNtv1QnFhxtPd7d5k4e+T7SkW1TQ==\n-----END EC PRIVATE KEY-----\n" | ||
| } | ||
| } | ||
| ], | ||
| "validationContext": { | ||
| "trustedCa": { | ||
| "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\nVGVzdCBDQSAyMB4XDTE5MDMyMjEzNTgyNloXDTI5MDMyMjEzNTgyNlowFDESMBAG\nA1UEAxMJVGVzdCBDQSAyMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIhywH1gx\nAsMwuF3ukAI5YL2jFxH6Usnma1HFSfVyxbXX1/uoZEYrj8yCAtdU2yoHETyd+Zx2\nThhRLP79pYegCaOCATwwggE4MA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTAD\nAQH/MGgGA1UdDgRhBF9kMToxMToxMTphYzoyYTpiYTo5NzpiMjozZjphYzo3Yjpi\nZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1ZTo0MTo2ZjpmMjo3\nMzo5NTo1ODowYzpkYjBqBgNVHSMEYzBhgF9kMToxMToxMTphYzoyYTpiYTo5Nzpi\nMjozZjphYzo3YjpiZDpkYTpiZTpiMTo4YTpmYzo5YTpiYTpiNTpiYzo4MzplNzo1\nZTo0MTo2ZjpmMjo3Mzo5NTo1ODowYzpkYjA/BgNVHREEODA2hjRzcGlmZmU6Ly8x\nMTExMTExMS0yMjIyLTMzMzMtNDQ0NC01NTU1NTU1NTU1NTUuY29uc3VsMAoGCCqG\nSM49BAMCA0gAMEUCICOY0i246rQHJt8o8Oya0D5PLL1FnmsQmQqIGCi31RwnAiEA\noR5f6Ku+cig2Il8T8LJujOp2/2A72QcHZA57B13y+8o=\n-----END CERTIFICATE-----\n" | ||
| }, | ||
| "matchSubjectAltNames": [ | ||
| { | ||
| "exact": "spiffe://11111111-2222-3333-4444-555555555555.consul/ns/default/dc/dc1/svc/service" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "sni": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster", | ||
| "nonce": "00000001" | ||
| } |
41 changes: 41 additions & 0 deletions
41
...t/xds/testdata/endpoints/api-gateway-with-http-route-and-inline-certificate.latest.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "versionInfo": "00000001", | ||
| "resources": [ | ||
| { | ||
| "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", | ||
| "clusterName": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", | ||
| "endpoints": [ | ||
| { | ||
| "lbEndpoints": [ | ||
| { | ||
| "endpoint": { | ||
| "address": { | ||
| "socketAddress": { | ||
| "address": "10.10.1.1", | ||
| "portValue": 8080 | ||
| } | ||
| } | ||
| }, | ||
| "healthStatus": "HEALTHY", | ||
| "loadBalancingWeight": 1 | ||
| }, | ||
| { | ||
| "endpoint": { | ||
| "address": { | ||
| "socketAddress": { | ||
| "address": "10.10.1.2", | ||
| "portValue": 8080 | ||
| } | ||
| } | ||
| }, | ||
| "healthStatus": "HEALTHY", | ||
| "loadBalancingWeight": 1 | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment", | ||
| "nonce": "00000001" | ||
| } |
49 changes: 49 additions & 0 deletions
49
...t/xds/testdata/listeners/api-gateway-with-http-route-and-inline-certificate.latest.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| { | ||
| "versionInfo": "00000001", | ||
| "resources": [ | ||
| { | ||
| "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", | ||
| "name": "http:1.2.3.4:8080", | ||
| "address": { | ||
| "socketAddress": { | ||
| "address": "1.2.3.4", | ||
| "portValue": 8080 | ||
| } | ||
| }, | ||
| "filterChains": [ | ||
| { | ||
| "filters": [ | ||
| { | ||
| "name": "envoy.filters.network.http_connection_manager", | ||
| "typedConfig": { | ||
| "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", | ||
| "statPrefix": "ingress_upstream_8080", | ||
| "rds": { | ||
| "configSource": { | ||
| "ads": {}, | ||
| "resourceApiVersion": "V3" | ||
| }, | ||
| "routeConfigName": "8080" | ||
| }, | ||
| "httpFilters": [ | ||
| { | ||
| "name": "envoy.filters.http.router", | ||
| "typedConfig": { | ||
| "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router" | ||
| } | ||
| } | ||
| ], | ||
| "tracing": { | ||
| "randomSampling": {} | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "trafficDirection": "OUTBOUND" | ||
| } | ||
| ], | ||
| "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", | ||
| "nonce": "00000001" | ||
| } |
31 changes: 31 additions & 0 deletions
31
agent/xds/testdata/routes/api-gateway-with-http-route-and-inline-certificate.latest.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| { | ||
| "versionInfo": "00000001", | ||
| "resources": [ | ||
| { | ||
| "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", | ||
| "name": "8080", | ||
| "virtualHosts": [ | ||
| { | ||
| "name": "api-gateway-listener-9b9265b", | ||
| "domains": [ | ||
| "*", | ||
| "*:8080" | ||
| ], | ||
| "routes": [ | ||
| { | ||
| "match": { | ||
| "prefix": "/" | ||
| }, | ||
| "route": { | ||
| "cluster": "service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "validateClusters": true | ||
| } | ||
| ], | ||
| "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration", | ||
| "nonce": "00000001" | ||
| } |
5 changes: 5 additions & 0 deletions
5
agent/xds/testdata/secrets/api-gateway-with-http-route-and-inline-certificate.latest.golden
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { | ||
| "versionInfo": "00000001", | ||
| "typeUrl": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.Secret", | ||
| "nonce": "00000001" | ||
| } |
Oops, something went wrong.