Remove support for Envoy 1.15 #11118
Merged
Conversation
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
github-actions
bot
added
theme/envoy/xds
freddygv
approved these changes
Sep 23, 2021
rboyer
reviewed
Sep 23, 2021
rboyer
reviewed
Sep 23, 2021
| default: | ||
| return nil, fmt.Errorf("Invalid service kind: %v", cfgSnap.Kind) | ||
| } | ||
| } | ||
|
|
||
| func (s *ResourceGenerator) maybeInjectStubClusterForGateways(resources []proto.Message) ([]proto.Message, error) { |
rboyer
reviewed
Sep 23, 2021
| @@ -310,12 +310,6 @@ func (s *Server) processDelta(stream ADSDeltaStream, reqCh <-chan *envoy_discove | |||
| } | |||
| if sent { | |||
| sentType[op.TypeUrl] = struct{}{} | |||
| if generator.ProxyFeatures.IncrementalXDSUpdatesMustBeSerial { | |||
rboyer
reviewed
Sep 23, 2021
| GatewaysNeedStubClusterWhenEmptyWithIncrementalXDS bool | ||
|
|
||
| // IncrementalXDSUpdatesMustBeSerial is needed to avoid an envoy crash. | ||
| // For example, we previously had flags for Envoy < 1.16 called: |
There was a problem hiding this comment.
I like this. Prior to these 2 flags existing the struct was empty for a bit. Prior to that it had completely different features available. When I went to add these two flags I had to look at my own file history to see how to re-add a feature flag.
…eculver/remove-envoy-1.15
|
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/463501. |
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Refs #11100, stacked on #11115.
This is a follow on to #11115 to remove support for Envoy 1.15. The only notable changes are around the feature flags that we had in place for Envoy < 1.16, which means only 1.15. As such, I am removing these flags and code that references them.
Note: As this is pretty unfamiliar territory for me, I'd like to specifically call out the bits in
./agent/xds/clusters.gothat are getting removed (maybeInjectStubClusterForGatewaysand calling code). This appears correct to me, but need someone to confirm.I'll rebase on
mainonce #11115 lands but for now this will be based oneculver/envoy-1.19.