Fix envoy bootstrap logic to not append multiple self_admin clusters #8371
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
Previously, the envoy bootstrap config would blindly copy the self_admin cluster into the list of static clusters when configuring either ReadyBindAddr, PrometheusBindAddr, or StatsBindAddr. Since ingress gateways always configure the ReadyBindAddr property, users ran into this case much more often than previously.
crhino
added
type/bug
crhino
commented
Jul 23, 2020
| clusterJSON = ",\n" + clusterJSON | ||
| // Make sure we do not append the same cluster multiple times, as that will | ||
| // cause envoy startup to fail. | ||
| selfAdminClusterExists, err := containsSelfAdminCluster(args.StaticClustersJSON) |
There was a problem hiding this comment.
I started off by just doing a strings.Contains(args.StaticClustersJSON, clusterJSON), but decided to actually parse out the cluster names to validate it. I think the string comparison would've worked just fine, but parsing out the JSON and checking cluster names felt more semantically correct.
freddygv
approved these changes
Jul 23, 2020
|
🍒✅ Cherry pick of commit 7c4cc71 onto |
hashicorp-ci
pushed a commit
that referenced
this pull request
Jul 23, 2020
…8371) Previously, the envoy bootstrap config would blindly copy the self_admin cluster into the list of static clusters when configuring either ReadyBindAddr, PrometheusBindAddr, or StatsBindAddr. Since ingress gateways always configure the ReadyBindAddr property, users ran into this case much more often than previously.
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.
Previously, the envoy bootstrap config would blindly copy the self_admin
cluster into the list of static clusters when configuring either
ReadyBindAddr, PrometheusBindAddr, or StatsBindAddr.
Since ingress gateways always configure the ReadyBindAddr property,
users run into this case much more often than previously.