-
Notifications
You must be signed in to change notification settings - Fork 800
fix: use shared system trust store sds secret #9357
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
guydc
wants to merge
2
commits into
envoyproxy:main
Choose a base branch
from
guydc:feat-dedupe-truststore-sds
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
73 changes: 73 additions & 0 deletions
73
internal/xds/translator/testdata/in/xds-ir/http-route-multiple-system-truststore.yaml
This file contains hidden or 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,73 @@ | ||
| http: | ||
| - address: 0.0.0.0 | ||
| hostnames: | ||
| - '*' | ||
| name: envoy-gateway/gateway-btls/http | ||
| path: | ||
| escapedSlashesAction: UnescapeAndRedirect | ||
| mergeSlashes: true | ||
| port: 10080 | ||
| routes: | ||
| - destination: | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 10.244.0.11 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| tls: | ||
| CACertificate: | ||
| name: policy-btls-1/policies-ca | ||
| sni: backend-1.example.com | ||
| useSystemTrustStore: true | ||
| weight: 1 | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0/backend/0 | ||
| hostname: '*' | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0/match/0/* | ||
| pathMatch: | ||
| distinct: false | ||
| exact: /backend-1 | ||
| name: "" | ||
| - destination: | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 10.244.0.12 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| tls: | ||
| CACertificate: | ||
| name: policy-btls-2/policies-ca | ||
| sni: backend-2.example.com | ||
| useSystemTrustStore: true | ||
| weight: 1 | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0/backend/0 | ||
| hostname: '*' | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0/match/0/* | ||
| pathMatch: | ||
| distinct: false | ||
| exact: /backend-2 | ||
| name: "" | ||
| - destination: | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0 | ||
| settings: | ||
| - addressType: IP | ||
| endpoints: | ||
| - host: 10.244.0.13 | ||
| port: 8080 | ||
| protocol: HTTP | ||
| tls: | ||
| CACertificate: | ||
| name: policy-btls-3/policies-ca | ||
| sni: backend-3.example.com | ||
| useSystemTrustStore: true | ||
| weight: 1 | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0/backend/0 | ||
| hostname: '*' | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0/match/0/* | ||
| pathMatch: | ||
| distinct: false | ||
| exact: /backend-3 | ||
| name: "" |
4 changes: 4 additions & 0 deletions
4
...ranslator/testdata/out/extension-xds-ir/http-route-extension-translate-error.secrets.yaml
This file contains hidden or 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,4 @@ | ||
| - name: system_ca_certificates | ||
| validationContext: | ||
| trustedCa: | ||
| filename: /etc/ssl/certs/ca-certificates.crt |
This file contains hidden or 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 hidden or 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 hidden or 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
2 changes: 1 addition & 1 deletion
2
...anslator/testdata/out/xds-ir/http-route-dynamic-resolver-with-host-rewriting.secrets.yaml
This file contains hidden or 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 |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| - name: backend-with-system-ca/default-ca | ||
| - name: system_ca_certificates | ||
| validationContext: | ||
| trustedCa: | ||
| filename: /etc/ssl/certs/ca-certificates.crt |
171 changes: 171 additions & 0 deletions
171
...al/xds/translator/testdata/out/xds-ir/http-route-multiple-system-truststore.clusters.yaml
This file contains hidden or 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,171 @@ | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_PREFERRED | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/envoy-gateway/httproute-btls-1/rule/0 | ||
| ignoreHealthOnHostRemoval: true | ||
| loadBalancingPolicy: | ||
| policies: | ||
| - typedExtensionConfig: | ||
| name: envoy.load_balancing_policies.least_request | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest | ||
| localityLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0 | ||
| perConnectionBufferLimitBytes: 32768 | ||
| transportSocket: | ||
| name: dummy.transport_socket | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: {} | ||
| transportSocketMatches: | ||
| - match: | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0/tls/0 | ||
| name: httproute/envoy-gateway/httproute-btls-1/rule/0/tls/0 | ||
| transportSocket: | ||
| name: envoy.transport_sockets.tls | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: | ||
| combinedValidationContext: | ||
| defaultValidationContext: | ||
| matchTypedSubjectAltNames: | ||
| - matcher: | ||
| exact: backend-1.example.com | ||
| sanType: DNS | ||
| validationContextSdsSecretConfig: | ||
| name: system_ca_certificates | ||
| sdsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| sni: backend-1.example.com | ||
| type: EDS | ||
| typedExtensionProtocolOptions: | ||
| envoy.extensions.upstreams.http.v3.HttpProtocolOptions: | ||
| '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions | ||
| autoConfig: | ||
| http2ProtocolOptions: | ||
| initialConnectionWindowSize: 1048576 | ||
| initialStreamWindowSize: 65536 | ||
| httpProtocolOptions: {} | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_PREFERRED | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/envoy-gateway/httproute-btls-2/rule/0 | ||
| ignoreHealthOnHostRemoval: true | ||
| loadBalancingPolicy: | ||
| policies: | ||
| - typedExtensionConfig: | ||
| name: envoy.load_balancing_policies.least_request | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest | ||
| localityLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0 | ||
| perConnectionBufferLimitBytes: 32768 | ||
| transportSocket: | ||
| name: dummy.transport_socket | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: {} | ||
| transportSocketMatches: | ||
| - match: | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0/tls/0 | ||
| name: httproute/envoy-gateway/httproute-btls-2/rule/0/tls/0 | ||
| transportSocket: | ||
| name: envoy.transport_sockets.tls | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: | ||
| combinedValidationContext: | ||
| defaultValidationContext: | ||
| matchTypedSubjectAltNames: | ||
| - matcher: | ||
| exact: backend-2.example.com | ||
| sanType: DNS | ||
| validationContextSdsSecretConfig: | ||
| name: system_ca_certificates | ||
| sdsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| sni: backend-2.example.com | ||
| type: EDS | ||
| typedExtensionProtocolOptions: | ||
| envoy.extensions.upstreams.http.v3.HttpProtocolOptions: | ||
| '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions | ||
| autoConfig: | ||
| http2ProtocolOptions: | ||
| initialConnectionWindowSize: 1048576 | ||
| initialStreamWindowSize: 65536 | ||
| httpProtocolOptions: {} | ||
| - circuitBreakers: | ||
| thresholds: | ||
| - maxRetries: 1024 | ||
| commonLbConfig: {} | ||
| connectTimeout: 10s | ||
| dnsLookupFamily: V4_PREFERRED | ||
| edsClusterConfig: | ||
| edsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| serviceName: httproute/envoy-gateway/httproute-btls-3/rule/0 | ||
| ignoreHealthOnHostRemoval: true | ||
| loadBalancingPolicy: | ||
| policies: | ||
| - typedExtensionConfig: | ||
| name: envoy.load_balancing_policies.least_request | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.load_balancing_policies.least_request.v3.LeastRequest | ||
| localityLbConfig: | ||
| localityWeightedLbConfig: {} | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0 | ||
| perConnectionBufferLimitBytes: 32768 | ||
| transportSocket: | ||
| name: dummy.transport_socket | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: {} | ||
| transportSocketMatches: | ||
| - match: | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0/tls/0 | ||
| name: httproute/envoy-gateway/httproute-btls-3/rule/0/tls/0 | ||
| transportSocket: | ||
| name: envoy.transport_sockets.tls | ||
| typedConfig: | ||
| '@type': type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext | ||
| commonTlsContext: | ||
| combinedValidationContext: | ||
| defaultValidationContext: | ||
| matchTypedSubjectAltNames: | ||
| - matcher: | ||
| exact: backend-3.example.com | ||
| sanType: DNS | ||
| validationContextSdsSecretConfig: | ||
| name: system_ca_certificates | ||
| sdsConfig: | ||
| ads: {} | ||
| resourceApiVersion: V3 | ||
| sni: backend-3.example.com | ||
| type: EDS | ||
| typedExtensionProtocolOptions: | ||
| envoy.extensions.upstreams.http.v3.HttpProtocolOptions: | ||
| '@type': type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions | ||
| autoConfig: | ||
| http2ProtocolOptions: | ||
| initialConnectionWindowSize: 1048576 | ||
| initialStreamWindowSize: 65536 | ||
| httpProtocolOptions: {} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When an EnvoyPatchPolicy or post-translation extension renames/removes the generated
system_ca_certificatessecret, every cluster that usedWellKnownCACertificates: Systemstill references that SDS name, but this validation returns success becausefindXdsSecretno longer finds it. If the patch leaves the filename intact while adding other fields to the validation context, it also passes. In those patch/extension cases translation succeeds with clusters pointing at a missing or globally altered trust-store secret instead of surfacing the reserved-name error.Useful? React with 👍 / 👎.