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

fix: mergeGateways panics when restarting control plane #2283

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

Xunzhuo
Copy link
Member

@Xunzhuo Xunzhuo commented Dec 8, 2023

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #2282

@Xunzhuo Xunzhuo requested a review from a team as a code owner December 8, 2023 03:29
@Xunzhuo Xunzhuo added this to the v1.0.0-rc1 milestone Dec 8, 2023
Copy link

codecov bot commented Dec 8, 2023

Codecov Report

Attention: 10 lines in your changes are missing coverage. Please review.

Comparison is base (f71f372) 64.38% compared to head (ce265c7) 64.37%.

Files Patch % Lines
internal/provider/kubernetes/predicates.go 0.00% 10 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2283      +/-   ##
==========================================
- Coverage   64.38%   64.37%   -0.01%     
==========================================
  Files         112      112              
  Lines       15874    15876       +2     
==========================================
  Hits        10220    10220              
- Misses       5005     5007       +2     
  Partials      649      649              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zirain
Copy link
Contributor

zirain commented Dec 8, 2023

can you add a (e2e)test for this to avoid regression in the future?

@Xunzhuo
Copy link
Member Author

Xunzhuo commented Dec 8, 2023

Can this be a follow up ? @zirain

@zirain
Copy link
Contributor

zirain commented Dec 8, 2023

nop

@Xunzhuo
Copy link
Member Author

Xunzhuo commented Dec 8, 2023

Okay, let me update it later

@Xunzhuo
Copy link
Member Author

Xunzhuo commented Dec 13, 2023

I still think we can start working on e2e after #2029 (comment)

let us fix the bug first @zirain

@Xunzhuo Xunzhuo requested review from a team, qicz, zirain and Alice-Lilith December 13, 2023 04:07
zirain
zirain previously approved these changes Dec 13, 2023
@Xunzhuo Xunzhuo added the hold do not merge label Dec 13, 2023
@Xunzhuo
Copy link
Member Author

Xunzhuo commented Dec 13, 2023

Let me double check it before merging it.

Copy link
Member

@cnvergence cnvergence left a comment

Choose a reason for hiding this comment

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

@Xunzhuo ptal

internal/provider/kubernetes/predicates.go Outdated Show resolved Hide resolved
internal/provider/kubernetes/predicates.go Outdated Show resolved Hide resolved
@Xunzhuo Xunzhuo force-pushed the fix-mergeGateways-panics branch from c7bf4fb to 37cc4a0 Compare December 13, 2023 12:44
Signed-off-by: bitliu <bitliu@tencent.com>
@Xunzhuo Xunzhuo force-pushed the fix-mergeGateways-panics branch from 37cc4a0 to ce265c7 Compare December 13, 2023 12:46
@Xunzhuo Xunzhuo requested a review from cnvergence December 13, 2023 12:47
Copy link
Member

@cnvergence cnvergence left a comment

Choose a reason for hiding this comment

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

lgtm now

@Xunzhuo Xunzhuo requested a review from zirain December 13, 2023 12:48
@zirain zirain merged commit f7d1e2c into envoyproxy:main Dec 13, 2023
16 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hold do not merge road-to-ga
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

MergeGateways: nil pointer dereference
4 participants