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

Automated cherry pick of #2598: supportbundle: fix nil pointer error #2789

Conversation

liu4480
Copy link
Contributor

@liu4480 liu4480 commented Sep 16, 2021

Cherry pick of #2598 on release-1.2.

#2598: supportbundle: fix nil pointer error

For details on the cherry pick process, see the cherry pick requests page.

when iproute2 is not installed in docker image, and run `antctl supportbundle` in
antrea-agent, it will panic, this is because, collectAgent will return a nil pointer
for systemv1beta1.SupportBundle, and in `func (r *supportBundleREST) Create`,
antrea handles the nil pointer directly which leads to the panic.

Signed-off-by: Bin Liu <biliu@vmware.com>
@liu4480 liu4480 added the kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release label Sep 16, 2021
@liu4480 liu4480 requested a review from tnqn September 16, 2021 08:40
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn
Copy link
Member

tnqn commented Sep 16, 2021

/test-e2e
/skip-networkpolicy
/skip-conformance

@codecov-commenter
Copy link

codecov-commenter commented Sep 16, 2021

Codecov Report

Merging #2789 (3ec599c) into release-1.2 (317f0ea) will increase coverage by 5.18%.
The diff coverage is 0.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-1.2    #2789      +/-   ##
===============================================
+ Coverage        60.03%   65.21%   +5.18%     
===============================================
  Files              284      284              
  Lines            22396    25684    +3288     
===============================================
+ Hits             13445    16751    +3306     
+ Misses            7510     7368     -142     
- Partials          1441     1565     +124     
Flag Coverage Δ
e2e-tests 55.72% <0.00%> (?)
kind-e2e-tests 47.08% <0.00%> (+0.47%) ⬆️
unit-tests 42.51% <0.00%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...kg/apiserver/registry/system/supportbundle/rest.go 75.63% <0.00%> (+0.05%) ⬆️
pkg/controller/egress/ipallocator/allocator.go 67.82% <0.00%> (-15.16%) ⬇️
pkg/controller/networkpolicy/endpoint_querier.go 77.64% <0.00%> (-13.79%) ⬇️
pkg/apis/controlplane/v1beta1/conversion.go 72.44% <0.00%> (-11.89%) ⬇️
pkg/legacyapis/core/v1alpha2/register.go 69.23% <0.00%> (-10.77%) ⬇️
pkg/controller/egress/controller.go 76.76% <0.00%> (-10.44%) ⬇️
pkg/apis/stats/register.go 71.42% <0.00%> (-10.39%) ⬇️
pkg/legacyapis/stats/register.go 71.42% <0.00%> (-10.39%) ⬇️
pkg/ovs/openflow/ofctrl_meter.go 33.84% <0.00%> (-10.16%) ⬇️
pkg/legacyapis/security/v1alpha1/register.go 73.33% <0.00%> (-10.00%) ⬇️
... and 269 more

@tnqn tnqn merged commit 116d6db into antrea-io:release-1.2 Sep 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants