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.

Sign up for GitHub

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

Jump to bottom

[bp/1.25] Backport stack #28441

Merged
merged 3 commits into from Jul 20, 2023
Merged

[bp/1.25] Backport stack #28441

merged 3 commits into from Jul 20, 2023

Conversation

phlax
Copy link
Member

@phlax phlax commented Jul 17, 2023

Commit Message:
Additional Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Fixes commit #PR or SHA]
[Optional Deprecated:]
[Optional API Considerations:]

@phlax
deps: Bump rules_rust -> 0.25.1 (envoyproxy#28352)
0fbaae3 
Fix envoyproxy#28261

Signed-off-by: Ryan Northey <ryan@synca.io>
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Jul 17, 2023
@repokitteh-read-only
Copy link

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).
envoyproxy/dependency-shepherds assignee is @htuch

🐱

Caused by: #28441 was opened by phlax.

see: more, trace.

@phlax phlax added this to the 1.25.9 milestone Jul 17, 2023
@phlax
deps: Bump edenhill_librdkafka -> 2.2.0 (envoyproxy#28437)
3e44620 
Signed-off-by: Ryan Northey <ryan@synca.io>
@htuch
Copy link
Member

htuch commented Jul 18, 2023

@phlax how come we are backporting non-critical dependency changes?

@phlax
Copy link
Member Author

phlax commented Jul 18, 2023

how come we are backporting non-critical dependency changes?

there are a few deps that are in the intersection of a) deps that issue CVEs, and b) deps that we have correctly configured to track - wasm/rust/kafka in particular

historically we have had to update/backport these deps in response to the CVEs, so now i just always backport them

htuch
htuch previously approved these changes Jul 19, 2023
View reviewed changes
Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ack, thanks.

@repokitteh-read-only repokitteh-read-only bot removed the deps Approval required for changes to Envoy's external dependencies label Jul 19, 2023
@repokitteh-read-only repokitteh-read-only bot added the deps Approval required for changes to Envoy's external dependencies label Jul 20, 2023
@phlax phlax changed the title [WIP/bp/1.25] Backport stack [bp/1.25] Backport stack Jul 20, 2023
@phlax phlax enabled auto-merge (rebase) July 20, 2023 11:58
@phlax phlax disabled auto-merge July 20, 2023 13:22
@wbpcode @phlax
temporarily workaround failed test on windows (envoyproxy#28505)
02d471e 
Signed-off-by: wbpcode <wangbaiping@corp.netease.com>
Signed-off-by: Ryan Northey <ryan@synca.io>
@phlax phlax enabled auto-merge (rebase) July 20, 2023 15:22
@phlax
Copy link
Member Author

phlax commented Jul 20, 2023

landing to fix branch

@phlax phlax disabled auto-merge July 20, 2023 17:16
@phlax phlax merged commit faf6eb3 into envoyproxy:release/v1.25 Jul 20, 2023
71 of 72 checks passed
@phlax phlax mentioned this pull request Aug 22, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@htuch htuch htuch left review comments

@alyssawilk alyssawilk Awaiting requested review from alyssawilk alyssawilk is a code owner

@mattklein123 mattklein123 Awaiting requested review from mattklein123 mattklein123 is a code owner

@yanavlasov yanavlasov Awaiting requested review from yanavlasov yanavlasov is a code owner

Assignees

@htuch htuch

@wbpcode wbpcode

Labels
deps Approval required for changes to Envoy's external dependencies
Projects
None yet
Milestone
1.25.9
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@phlax @htuch @wbpcode