backport pr 15979 into 1.14.x #17287
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/api
DanStough
approved these changes
May 10, 2023
There was a problem hiding this comment.
Not blocking, but you may want to change this to #17287 if you are changing other things.
| @@ -192,8 +193,15 @@ func ToOutlierDetection(p *structs.PassiveHealthCheck) *envoy_cluster_v3.Outlier | |||
| } | |||
|
|
|||
| if p.EnforcingConsecutive5xx != nil { | |||
| // NOTE: EnforcingConsecutive5xx must be greater than 0 for ingress-gateway | |||
| od.EnforcingConsecutive_5Xx = &wrappers.UInt32Value{Value: *p.EnforcingConsecutive5xx} | |||
There was a problem hiding this comment.
It looks like wrappers comes from the deprecated GH package. I don't think it's critical to this PR, but if we went through the process of upgrading the proto generation to the google.golang version, we might want to clean it out completely. Not sure how much of a lift this is, though. Not blocking.
There was a problem hiding this comment.
Good point, I can change it in another PR. I want to make sure it won't break the backport assist PRs with out of band changes.
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.
manually backport pr #15979 into 1.14.x (backport assist failed)
This PR update protobuf package to
google.golang.org/protobufsincegithub.com/golang/protobufis deprecated.PR Checklist