Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock #2008

Dyanngg · 2021-03-29T21:44:51Z

This PR upgrades ClusterGroup CRD related resources to crd/v1alpha3 to deprecate ipBlock in crd/v1alpha2 ClusterGroup.

The CRD upgrade process follows https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definition-versioning/. Namely, there is a conversion webhook deployed to convert crd/v1alpha2 ClusterGroup to crd/v1alpha3 and vice versa. crd/v1alpha2 ClusterGroup will continue to be served until deprecated.

On Antrea controller startup it will use the apiextension clienset to sync CA cert between Antrea apiserver and conversion webhook config of the ClusterGroup CRD. Conversion endpoint will be /convert/clustergroup.

lgtm-com · 2021-03-29T22:07:14Z

This pull request introduces 6 alerts when merging 6e2ce92 into 85456c9 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-03-29T22:57:09Z

This pull request introduces 6 alerts when merging 41425b0 into 85456c9 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

codecov-io · 2021-03-29T23:13:01Z

Codecov Report

Merging #2008 (65b1957) into main (5752f96) will decrease coverage by 6.42%.
The diff coverage is 12.98%.

@@            Coverage Diff             @@
##             main    #2008      +/-   ##
==========================================
- Coverage   61.57%   55.15%   -6.43%     
==========================================
  Files         265      268       +3     
  Lines       19770    19949     +179     
==========================================
- Hits        12174    11003    -1171     
- Misses       6333     7782    +1449     
+ Partials     1263     1164      -99

Flag	Coverage Δ
kind-e2e-tests	`41.43% <8.17%> (-11.44%)`	⬇️
unit-tests	`41.31% <9.94%> (-0.40%)`	⬇️

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

Impacted Files	Coverage Δ
pkg/apiserver/apiserver.go	`78.22% <0.00%> (-11.21%)`	⬇️
pkg/controller/grouping/convert.go	`0.00% <0.00%> (ø)`
...ntroller/networkpolicy/networkpolicy_controller.go	`69.13% <ø> (-15.44%)`	⬇️
pkg/controller/networkpolicy/status_controller.go	`48.10% <0.00%> (-40.72%)`	⬇️
pkg/apiserver/handlers/webhook/convert_crd.go	`2.56% <2.56%> (ø)`
pkg/apiserver/certificate/cacert_controller.go	`35.76% <23.80%> (-23.20%)`	⬇️
pkg/k8s/client.go	`49.01% <25.00%> (-0.99%)`	⬇️
pkg/apis/crd/v1alpha3/register.go	`75.00% <75.00%> (ø)`
pkg/controller/networkpolicy/clustergroup.go	`66.35% <90.90%> (-16.22%)`	⬇️
pkg/apiserver/certificate/certificate.go	`76.71% <100.00%> (+6.84%)`	⬆️
... and 71 more

lgtm-com · 2021-04-06T00:12:05Z

This pull request introduces 6 alerts when merging 322b9a2 into 3b294ea - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-04-06T21:45:59Z

This pull request introduces 6 alerts when merging 65b1957 into 5752f96 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-04-16T18:15:06Z

This pull request introduces 6 alerts when merging dcea255 into 1890da1 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-04-16T19:09:59Z

This pull request introduces 6 alerts when merging a11ce47 into 1890da1 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-04-16T21:13:31Z

This pull request introduces 6 alerts when merging 1ca667c into 1890da1 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

codecov-commenter · 2021-04-16T21:57:16Z

Codecov Report

Merging #2008 (771477a) into main (771477a) will not change coverage.
The diff coverage is n/a.

❗ Current head 771477a differs from pull request most recent head 7364b7f. Consider uploading reports for the commit 7364b7f to get more accurate results

@@           Coverage Diff           @@
##             main    #2008   +/-   ##
=======================================
  Coverage   41.33%   41.33%           
=======================================
  Files         132      132           
  Lines       16539    16539           
=======================================
  Hits         6837     6837           
  Misses       9115     9115           
  Partials      587      587

Flag	Coverage Δ
unit-tests	`41.33% <0.00%> (ø)`

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

tnqn

Reviewed 37 files so far, will continue..

build/yamls/base/controller-rbac.yml

cmd/antrea-controller/controller.go

pkg/apiserver/handlers/webhook/convert_crd.go

lgtm-com · 2021-04-21T21:09:12Z

This pull request introduces 6 alerts when merging 69887bd into 9bb7179 - view on LGTM.com

new alerts:

6 for Reflected cross-site scripting

lgtm-com · 2021-04-21T21:38:15Z

This pull request introduces 1 alert when merging deb023b into 422d92d - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

lgtm-com · 2021-05-11T00:54:58Z

This pull request introduces 1 alert when merging ec478e6 into d6e1d7e - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

lgtm-com · 2021-05-11T03:35:54Z

This pull request introduces 1 alert when merging b5eab04 into 03fe6ee - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

lgtm-com · 2021-05-11T18:17:11Z

This pull request introduces 1 alert when merging 4b7086e into ce7c844 - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

lgtm-com · 2021-05-11T21:38:30Z

This pull request introduces 1 alert when merging ed0bded into ce7c844 - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

Dyanngg · 2021-05-11T23:27:26Z

/test-all

tnqn

LGTM, however conflicts need to be resolved

Dyanngg · 2021-05-14T00:04:29Z

LGTM, however conflicts need to be resolved

Rebased onto the main branch

lgtm-com · 2021-05-14T00:41:25Z

This pull request introduces 1 alert when merging 7364b7f into 771477a - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

tnqn · 2021-05-14T02:47:36Z

pkg/controller/grouping/convert.go

@@ -0,0 +1,69 @@
+// Copyright 2021 Antrea Authors


Sorry, I just noticed this location of this file. I fell it might be a little confusing for developers that the package contains unrelated two topics: one is the calculation of the group members, one is the convertion of ClusterGroup API. What do you think about pkg/apiserver/handlers/webhook/ for this file?

I moved it to pkg/controller/networkpolicy/convert.go to follow what the validation and mutation webhook's pattern. I'll leave it out of pkg/apiserver/handlers/webhook/ so that this pkg can focus on the webhook infra and not the actual conversion/mutation/validation logic

pkg/controller/grouping/convert.go

go.mod

lgtm-com · 2021-05-14T18:39:15Z

This pull request introduces 1 alert when merging fa4d34d into 3134f7e - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

Add apiextensions-apiserver clientset and convert function for two versions of CRDs Add convert function for the two versions of CRDs Add controller logic to handle ipBlocks Fix issues in webhook registration Fix conversion logic Add E2E test and fix UT Address comment Signed-off-by: Yang Ding <[email protected]>

Dyanngg · 2021-05-14T19:23:27Z

/test-all

lgtm-com · 2021-05-14T20:11:30Z

This pull request introduces 1 alert when merging ca34206 into 3134f7e - view on LGTM.com

new alerts:

1 for Reflected cross-site scripting

tnqn

LGTM

Dyanngg · 2021-05-17T18:17:41Z

/test-networkpolicy

Dyanngg · 2021-05-18T20:24:40Z

/test-networkpolicy

Dyanngg requested review from edwardbadboy, antoninbas and tnqn March 29, 2021 21:44

vmwclabot added the cla-not-required label Mar 29, 2021

Dyanngg force-pushed the cg-ipb-slice branch from 6e2ce92 to 41425b0 Compare March 29, 2021 22:37

Dyanngg changed the title ~~Bump ClusterGroup to core/v1alpha3 and support ipBlocks slice~~ [WIP] Bump ClusterGroup to core/v1alpha3 and support ipBlocks slice Mar 30, 2021

Dyanngg mentioned this pull request Mar 30, 2021

Add ability to specify a list of ipBlocks in crd/v1alpha2 ClusterGroup #1993

Merged

Dyanngg force-pushed the cg-ipb-slice branch from 41425b0 to 322b9a2 Compare April 5, 2021 23:53

Dyanngg force-pushed the cg-ipb-slice branch from 322b9a2 to b177526 Compare April 6, 2021 21:06

Dyanngg changed the title ~~[WIP] Bump ClusterGroup to core/v1alpha3 and support ipBlocks slice~~ Bump ClusterGroup to crd/v1alpha3 to deprecate single ipBlock Apr 6, 2021

Dyanngg force-pushed the cg-ipb-slice branch from b177526 to 65b1957 Compare April 6, 2021 21:20

Dyanngg force-pushed the cg-ipb-slice branch from 65b1957 to dcea255 Compare April 16, 2021 17:54

Dyanngg force-pushed the cg-ipb-slice branch from dcea255 to a11ce47 Compare April 16, 2021 18:48

Dyanngg force-pushed the cg-ipb-slice branch from a11ce47 to 1ca667c Compare April 16, 2021 20:52

tnqn reviewed Apr 20, 2021

View reviewed changes

build/yamls/base/controller-rbac.yml Outdated Show resolved Hide resolved

cmd/antrea-controller/controller.go Outdated Show resolved Hide resolved

pkg/apiserver/handlers/webhook/convert_crd.go Outdated Show resolved Hide resolved

Dyanngg force-pushed the cg-ipb-slice branch from 1ca667c to 69887bd Compare April 21, 2021 20:43

antoninbas added the kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API. label Apr 21, 2021

antoninbas added this to the Antrea v1.1 release milestone Apr 21, 2021

Dyanngg force-pushed the cg-ipb-slice branch from 69887bd to deb023b Compare April 21, 2021 21:16

Dyanngg force-pushed the cg-ipb-slice branch from ec478e6 to b5eab04 Compare May 11, 2021 03:15

Dyanngg requested a review from tnqn May 11, 2021 03:16

Dyanngg force-pushed the cg-ipb-slice branch from b5eab04 to 4b7086e Compare May 11, 2021 17:47

Dyanngg force-pushed the cg-ipb-slice branch from 4b7086e to ed0bded Compare May 11, 2021 21:07

tnqn previously approved these changes May 13, 2021

View reviewed changes

Dyanngg dismissed tnqn’s stale review via f34a2f6 May 14, 2021 00:03

Dyanngg force-pushed the cg-ipb-slice branch from ed0bded to f34a2f6 Compare May 14, 2021 00:03

Dyanngg changed the title ~~Bump ClusterGroup to crd/v1alpha3 to deprecate single ipBlock~~ Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock May 14, 2021

Dyanngg force-pushed the cg-ipb-slice branch from f34a2f6 to 7364b7f Compare May 14, 2021 00:14

tnqn reviewed May 14, 2021

View reviewed changes

pkg/controller/grouping/convert.go Outdated Show resolved Hide resolved

go.mod Outdated Show resolved Hide resolved

Dyanngg force-pushed the cg-ipb-slice branch from 7364b7f to fa4d34d Compare May 14, 2021 18:08

Dyanngg force-pushed the cg-ipb-slice branch from fa4d34d to ca34206 Compare May 14, 2021 19:23

Dyanngg requested a review from tnqn May 14, 2021 20:52

tnqn approved these changes May 17, 2021

View reviewed changes

Dyanngg merged commit a9c7744 into antrea-io:main May 19, 2021

Dyanngg deleted the cg-ipb-slice branch May 19, 2021 04:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock #2008

Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock #2008

Dyanngg commented Mar 29, 2021 •

edited

Loading

lgtm-com bot commented Mar 29, 2021

lgtm-com bot commented Mar 29, 2021

codecov-io commented Mar 29, 2021 •

edited

Loading

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 16, 2021

lgtm-com bot commented Apr 16, 2021

lgtm-com bot commented Apr 16, 2021

codecov-commenter commented Apr 16, 2021 •

edited

Loading

tnqn left a comment

lgtm-com bot commented Apr 21, 2021

lgtm-com bot commented Apr 21, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

Dyanngg commented May 11, 2021

tnqn left a comment

Dyanngg commented May 14, 2021

lgtm-com bot commented May 14, 2021

tnqn May 14, 2021

Dyanngg May 14, 2021

lgtm-com bot commented May 14, 2021

Dyanngg commented May 14, 2021

lgtm-com bot commented May 14, 2021

tnqn left a comment

Dyanngg commented May 17, 2021

Dyanngg commented May 18, 2021

Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock #2008

Bump ClusterGroup to crd/v1alpha3 and deprecate single ipBlock #2008

Conversation

Dyanngg commented Mar 29, 2021 • edited Loading

lgtm-com bot commented Mar 29, 2021

lgtm-com bot commented Mar 29, 2021

codecov-io commented Mar 29, 2021 • edited Loading

Codecov Report

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 6, 2021

lgtm-com bot commented Apr 16, 2021

lgtm-com bot commented Apr 16, 2021

lgtm-com bot commented Apr 16, 2021

codecov-commenter commented Apr 16, 2021 • edited Loading

Codecov Report

tnqn left a comment

Choose a reason for hiding this comment

lgtm-com bot commented Apr 21, 2021

lgtm-com bot commented Apr 21, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

lgtm-com bot commented May 11, 2021

Dyanngg commented May 11, 2021

tnqn left a comment

Choose a reason for hiding this comment

Dyanngg commented May 14, 2021

lgtm-com bot commented May 14, 2021

tnqn May 14, 2021

Choose a reason for hiding this comment

Dyanngg May 14, 2021

Choose a reason for hiding this comment

lgtm-com bot commented May 14, 2021

Dyanngg commented May 14, 2021

lgtm-com bot commented May 14, 2021

tnqn left a comment

Choose a reason for hiding this comment

Dyanngg commented May 17, 2021

Dyanngg commented May 18, 2021

Dyanngg commented Mar 29, 2021 •

edited

Loading

codecov-io commented Mar 29, 2021 •

edited

Loading

codecov-commenter commented Apr 16, 2021 •

edited

Loading