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 #2302: Fix MarshalJSON error caused by incorrect conversion function #2312

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Jun 25, 2021

Cherry pick of #2302 on release-0.13.

#2302: Fix MarshalJSON error caused by incorrect conversion function

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

controlplane.Service couldn't be converted to v1beta1.Service directly
as it has an extra field. This patch fixes it by using the
auto-generated conversion function.

Signed-off-by: Quan Tian <qtian@vmware.com>
@tnqn tnqn 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 Jun 25, 2021
@codecov-commenter
Copy link

codecov-commenter commented Jun 25, 2021

Codecov Report

Merging #2312 (e5f4a0e) into release-0.13 (439d091) will decrease coverage by 22.80%.
The diff coverage is 0.00%.

❗ Current head e5f4a0e differs from pull request most recent head 3f9b033. Consider uploading reports for the commit 3f9b033 to get more accurate results
Impacted file tree graph

@@                Coverage Diff                @@
##           release-0.13    #2312       +/-   ##
=================================================
- Coverage         55.99%   33.19%   -22.81%     
=================================================
  Files               201      185       -16     
  Lines             17304    15905     -1399     
=================================================
- Hits               9690     5279     -4411     
- Misses             6571     9958     +3387     
+ Partials           1043      668      -375     
Flag Coverage Δ
e2e-tests 33.19% <0.00%> (?)
kind-e2e-tests ?
unit-tests ?

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

Impacted Files Coverage Δ
pkg/apis/controlplane/v1beta1/conversion.go 1.20% <0.00%> (-79.81%) ⬇️
pkg/ipfix/ipfix_set.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/ipfix/ipfix_registry.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/agent/flowexporter/utils.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/ovs/ovsctl/ovsctl_others.go 0.00% <0.00%> (-100.00%) ⬇️
pkg/agent/stats/collector.go 0.00% <0.00%> (-97.73%) ⬇️
pkg/ovs/openflow/ofctrl_packetout.go 0.00% <0.00%> (-91.92%) ⬇️
...g/agent/apiserver/handlers/podinterface/handler.go 0.00% <0.00%> (-90.63%) ⬇️
pkg/controller/networkpolicy/crd_utils.go 0.00% <0.00%> (-90.22%) ⬇️
pkg/controller/networkpolicy/endpoint_querier.go 2.70% <0.00%> (-83.79%) ⬇️
... and 116 more

@tnqn
Copy link
Member Author

tnqn commented Jun 25, 2021

/test-all

@tnqn
Copy link
Member Author

tnqn commented Jun 29, 2021

Currently upgrade tests doesn't work for release branches. I did manual upgrade test from v0.11.4 and v0.12.3 to v0.13.2-3f9b0335, all succeeded.

@tnqn tnqn merged commit 7d616fb into antrea-io:release-0.13 Jun 29, 2021
@tnqn tnqn deleted the automated-cherry-pick-of-#2302-upstream-release-0.13 branch June 29, 2021 09:47
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