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 #2310

Conversation

tnqn
Copy link
Member

@tnqn tnqn commented Jun 25, 2021

Cherry pick of #2302 on release-1.1.

#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 <[email protected]>
@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 #2310 (d8b5f34) into release-1.1 (51c6ba9) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-1.1    #2310      +/-   ##
===============================================
- Coverage        61.94%   61.89%   -0.05%     
===============================================
  Files              276      276              
  Lines            21178    21169       -9     
===============================================
- Hits             13119    13103      -16     
- Misses            6695     6710      +15     
+ Partials          1364     1356       -8     
Flag Coverage Δ
e2e-tests ∅ <ø> (?)
kind-e2e-tests 53.02% <0.00%> (-0.09%) ⬇️
unit-tests 41.35% <100.00%> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
pkg/apis/controlplane/v1beta1/conversion.go 84.33% <100.00%> (+3.32%) ⬆️
pkg/agent/flowexporter/exporter/certificate.go 50.00% <0.00%> (-16.67%) ⬇️
pkg/apiserver/storage/ram/watch.go 90.38% <0.00%> (-3.85%) ⬇️
...gent/controller/networkpolicy/status_controller.go 75.34% <0.00%> (-2.74%) ⬇️
pkg/agent/openflow/pipeline.go 69.57% <0.00%> (-2.12%) ⬇️
pkg/agent/openflow/client.go 57.89% <0.00%> (-0.76%) ⬇️
pkg/agent/flowexporter/exporter/exporter.go 78.66% <0.00%> (-0.46%) ⬇️
pkg/agent/agent.go 50.11% <0.00%> (+0.22%) ⬆️
pkg/agent/route/route_linux.go 44.68% <0.00%> (+0.53%) ⬆️
pkg/flowaggregator/flowaggregator.go 59.40% <0.00%> (+0.85%) ⬆️
... and 2 more

@tnqn
Copy link
Member Author

tnqn commented Jun 25, 2021

/test-all

@tnqn tnqn merged commit 80ef9de into antrea-io:release-1.1 Jun 25, 2021
@tnqn tnqn deleted the automated-cherry-pick-of-#2302-upstream-release-1.1 branch June 25, 2021 05:58
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