Skip to content
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

Backport: Bump grpc-go and x/net #50236 #50259

Merged
merged 3 commits into from
Apr 4, 2024

Conversation

bleggett
Copy link
Contributor

@bleggett bleggett commented Apr 4, 2024

Please provide a description of this PR:

Backport of #50236 (security bump) and #50129 (minor bump) and #48841 (related dependency bump)

Context: https://istio.slack.com/archives/C069NSVHR0T/p1712242223880279

@istio-policy-bot istio-policy-bot added the release-notes-none Indicates a PR that does not require release notes. label Apr 4, 2024
@istio-testing
Copy link
Collaborator

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@istio-testing istio-testing added needs-rebase Indicates a PR needs to be rebased before being merged size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 4, 2024
@bleggett bleggett changed the base branch from master to release-1.21 April 4, 2024 18:09
@bleggett bleggett requested a review from a team as a code owner April 4, 2024 18:09
@istio-testing istio-testing added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 4, 2024
@bleggett bleggett removed request for a team April 4, 2024 18:10
@bleggett
Copy link
Contributor Author

bleggett commented Apr 4, 2024

/retest

@bleggett bleggett removed the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 4, 2024
@istio istio deleted a comment from istio-testing Apr 4, 2024
@istio-testing istio-testing added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 4, 2024
Resolve breaking change in
grpc/grpc-go#6997.

This is a low leverl interface so I don't think its a huge concern it
broke

(cherry picked from commit 48a1921)
* Bump go-control-plane

* Bump and turn off by default

* fix gen

* bump

(cherry picked from commit faf5bdd)
@istio-testing istio-testing merged commit 94f115f into istio:release-1.21 Apr 4, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-notes-none Indicates a PR that does not require release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants