xds: Remove feature guarding using env vars for Cloud run CSM #12480
+172
−369
Conversation
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
GRPC_EXPERIMENTAL_XDS_SNI GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER
GRPC_EXPERIMENTAL_XDS_SNI GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER
ejona86
added
the
TODO:backport
ejona86
reviewed
Nov 11, 2025
Member
ejona86
left a comment
ejona86
left a comment
There was a problem hiding this comment.
I'd feel more comfortable if we left the feature guards in-place and just change their default value. GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER isn't really a concern, as any problems discovered there wouldn't be helped by keeping the env variable around. And the tests were already sort of broken.
| public static final String ENDPOINT_HOSTNAME = "data-host"; | ||
| public static final int ENDPOINT_PORT = 1234; | ||
| static final Bootstrapper.ServerInfo EMPTY_BOOTSTRAPPER_SERVER_INFO = | ||
| new Bootstrapper.ServerInfo() { |
Member
There was a problem hiding this comment.
This class shouldn't be extended. Use create() to construct.
| this.sslContextProviderSupplier = sslContextProviderSupplier; | ||
| EnvoyServerProtoData.BaseTlsContext tlsContext = sslContextProviderSupplier.getTlsContext(); | ||
| UpstreamTlsContext upstreamTlsContext = ((UpstreamTlsContext) tlsContext); | ||
| if (CertificateUtils.isXdsSniEnabled) { |
Member
There was a problem hiding this comment.
How is this being removed without also changing the default value of/deleting GRPC_EXPERIMENTAL_XDS_SNI?
Contributor
Author
|
It is easier to start from scratch for the changes to just change the default to true. I have raised a different PR #12499 for this. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Removes the following env var usages.
GRPC_EXPERIMENTAL_XDS_SNI
GRPC_EXPERIMENTAL_XDS_AUTHORITY_REWRITE
GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS
GRPC_EXPERIMENTAL_XDS_GCP_AUTHENTICATION_FILTER