Update ClusterClaim to v1alpha2 #3755

bangqipropel · 2022-05-09T19:58:20Z

Update ClusterClaim to v1alpha2

ClusterClaim upgraded to v1alpha2, with removeing the Name of it
meta.name in ClusterClaim can only be created as id.k8s.io or
clusterset.k8s.io
Deprecate ClusterClaim version v1alpha1

codecov-commenter · 2022-05-09T20:28:11Z

Codecov Report

Merging #3755 (108bf2f) into main (a07959e) will increase coverage by 6.74%.
The diff coverage is 54.54%.

@@            Coverage Diff             @@
##             main    #3755      +/-   ##
==========================================
+ Coverage   49.03%   55.78%   +6.74%     
==========================================
  Files         261      417     +156     
  Lines       39245    60810   +21565     
==========================================
+ Hits        19245    33921   +14676     
- Misses      18128    24112    +5984     
- Partials     1872     2777     +905

Flag	Coverage Δ
integration-tests	`35.20% <ø> (?)`
kind-e2e-tests	`50.11% <ø> (+1.08%)`	⬆️
unit-tests	`44.34% <54.54%> (?)`

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

Impacted Files	Coverage Δ
...ontrollers/multicluster/clusterclaim_controller.go	`0.00% <0.00%> (ø)`
...icluster/cmd/multicluster-controller/controller.go	`7.44% <50.00%> (ø)`
...uster/controllers/multicluster/controller_utils.go	`27.55% <50.00%> (ø)`
...s/multicluster/memberclusterannounce_controller.go	`71.79% <100.00%> (ø)`
...agent/flowexporter/connections/deny_connections.go	`68.96% <0.00%> (-11.50%)`	⬇️
pkg/agent/apiserver/apiserver.go	`67.02% <0.00%> (-4.26%)`	⬇️
pkg/agent/flowexporter/utils.go	`72.34% <0.00%> (-4.26%)`	⬇️
pkg/agent/controller/networkpolicy/reject.go	`82.48% <0.00%> (-3.39%)`	⬇️
pkg/flowaggregator/flowaggregator.go	`58.17% <0.00%> (-2.43%)`	⬇️
...lowaggregator/clickhouseclient/clickhouseclient.go	`82.98% <0.00%> (-0.71%)`	⬇️
... and 284 more

bangqipropel · 2022-05-22T09:03:53Z

@luolanzone this can be reviewed, thanks!

multicluster/apis/multicluster/v1alpha1/clusterclaim_conversion.go

multicluster/apis/multicluster/v1alpha2/clusterclaim_webhook.go

multicluster/apis/multicluster/v1alpha1/webhook_suite_test.go

multicluster/config/crd/bases/multicluster.crd.antrea.io_clusterclaims.yaml

docs/multicluster/api.md

multicluster/test/integration/suite_test.go

multicluster/test/yamls/east-member-cluster.yml

multicluster/config/rbac/role.yaml

multicluster/config/samples/multicluster_v1alpha1_clusterclaim.yaml

multicluster/config/samples/multicluster_v1alpha2_clusterclaim.yaml

luolanzone · 2022-06-14T02:45:54Z

@bangqipropel Please don't forget to add your sign-off info, and there are new conflicts, please resolve them. thanks.

docs/multicluster/api.md

multicluster/apis/multicluster/v1alpha2/clusterclaim_types.go

multicluster/apis/multicluster/v1alpha2/groupversion_info.go

multicluster/config/crd/patches/cainjection_in_clusterclaims.yaml

multicluster/controllers/multicluster/controller_utils.go

multicluster/test/integration/suite_test.go

multicluster/test/yamls/clusterset.yml

pkg/antctl/raw/multicluster/delete/clusterclaim.go

luolanzone · 2022-06-14T08:33:42Z

/test-multicluster-dataplane-e2e

bangqipropel · 2022-06-16T04:11:24Z

@luolanzone this can be reviewed again, thanks!

luolanzone · 2022-06-16T06:37:50Z

multicluster/apis/multicluster/v1alpha2/clusterclaim_types.go

@@ -29,13 +29,12 @@ const (

 // +genclient
 //+kubebuilder:object:root=true
+// +kubebuilder:storageversion


Do we need this if v1alpha1 is removed?

luolanzone · 2022-06-16T06:40:49Z

multicluster/controllers/multicluster/clusterclaim_controller.go

 func (r *ClusterClaimReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	_ = log.FromContext(ctx)

-	// your logic here
+	// TODO(user): your logic here


Could you remove this file as well? it has no reconcile logic and is not used.

multicluster/apis/multicluster/v1alpha2/zz_generated.deepcopy.go

luolanzone · 2022-06-16T09:19:18Z

Please update your PR summary and commit messages.

Update ClusterClaim to v1alpha2

1. ClusterClaim upgraded to v1alpha2, with removing the Name of it

2. metadata.name in ClusterClaim can only be `id.k8s.io` or
   `clusterset.k8s.io`

3. Deprecate ClusterClaim version v1alpha1

bangqipropel · 2022-06-22T01:41:51Z

/test-multicluster-dataplane-e2e

bangqipropel · 2022-06-22T01:49:40Z

@jianjuns can this be reviewed? thanks!

jianjuns

LGTM

bangqipropel · 2022-06-22T03:10:32Z

@tnqn can this be reviewed? thanks!

luolanzone · 2022-06-23T04:17:06Z

@bangqipropel Could you please resolve conflicts? and update the PR summary to link it with issue #3328. Thanks.

bangqipropel · 2022-06-26T08:49:13Z

/test-multicluster-dataplane-e2e

bangqipropel · 2022-06-26T21:12:30Z

@luolanzone it is good now, thanks!

bangqipropel · 2022-06-27T04:29:53Z

@tnqn can this be reviewed? thanks!

multicluster/build/yamls/antrea-multicluster-leader-global.yml

multicluster/pkg/client/informers/externalversions/multicluster/v1alpha1/interface.go

multicluster/pkg/client/listers/multicluster/v1alpha1/expansion_generated.go

tnqn · 2022-06-28T16:48:51Z

@tnqn can this be reviewed? thanks!

will take a look tomorrow.

bangqipropel · 2022-06-29T05:53:36Z

/test-multicluster-dataplane-e2e

luolanzone · 2022-06-29T14:02:23Z

/test-multicluster-e2e

luolanzone · 2022-06-29T14:02:50Z

Hi @bangqipropel , forget to tell you that the comment trigger of MC e2e is changed to test-multicluster-e2e, so please use it next time.

luolanzone · 2022-06-30T00:56:05Z

@bangqipropel , e2e failed, could you check here http://10.176.27.169:8080/job/antrea-multicluster-e2e-for-pull-request/30/console and fix the error?

tnqn

LGTM overall

tnqn · 2022-06-30T12:52:27Z

multicluster/apis/multicluster/v1alpha2/clusterclaim_webhook.go


 var _ webhook.Validator = &ClusterClaim{}

 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type
 func (r *ClusterClaim) ValidateCreate() error {
 	clusterclaimlog.Info("validate create", "name", r.Name)
+	if r.Name != WellKnownClusterClaimClusterSet && r.Name != WellKnownClusterClaimID {


But webhooks is not set in multicluster/PROJECT, will this be called?

➜ multicluster git:(CRD_v1alpha2) ✗ kubectl apply -f config/samples/clusterset_init/multicluster_membercluster_template.yaml clusterclaim.multicluster.crd.antrea.io/clusterset.k8s.io unchanged clusterset.multicluster.crd.antrea.io/test-clusterset unchanged Error from server (The name id.k8s.ioerror is not valid, only 'id.k8s.io' and 'clusterset.k8s.io' are valid name for ClusterClaim): error when creating "config/samples/clusterset_init/multicluster_member

@tnqn I think this is called?

I think the change in multicluster/PROJECT is confusing: It removes webhooks when bumping up to v1alpha2 which looks like it doesn't need webhooks any more. But I guess the deleted options were just using default values so it doesn't matter whether they exist. However, there are still some apis in that file setting webhooks to true explicitly, which is more confusing. What does it imply when it's set explictly and when it's not set?

multicluster/apis/multicluster/v1alpha2/clusterclaim_webhook.go

multicluster/test/yamls/east-member-cluster.yml

luolanzone · 2022-07-04T02:56:47Z

@bangqipropel Could you address quan's comment and resolve conflicts? I would suggest to merge this as early as possible. Thanks.

bangqipropel · 2022-07-05T22:09:24Z

/test-multicluster-e2e

1. ClusterClaim upgraded to v1alpha2, with removing the Name of it 2. metadata.name in ClusterClaim can only be `id.k8s.io` or `clusterset.k8s.io` 3. Deprecate ClusterClaim version v1alpha1 Signed-off-by: zbangqi <[email protected]>

bangqipropel · 2022-07-05T22:20:56Z

/test-multicluster-e2e

tnqn

LGTM

jianjuns · 2022-07-06T17:26:16Z

/skip-all
The change impacts only MC controller.

bangqipropel force-pushed the CRD_v1alpha2 branch 4 times, most recently from edca648 to fbe85da Compare May 11, 2022 00:40

luolanzone added the area/multi-cluster Issues or PRs related to multi cluster. label May 11, 2022

bangqipropel force-pushed the CRD_v1alpha2 branch 4 times, most recently from f9ef0ed to e6295af Compare May 22, 2022 09:03

bangqipropel changed the title ~~[WIP]: ClusterClaim v1alpha2~~ ClusterClaim v1alpha2 May 22, 2022

bangqipropel changed the title ~~ClusterClaim v1alpha2~~ Update ClusterClaim to v1alpha2 May 22, 2022

bangqipropel force-pushed the CRD_v1alpha2 branch from e6295af to 10abcb4 Compare May 24, 2022 23:00

luolanzone mentioned this pull request Jun 1, 2022

Multi-cluster bootstrap in antctl #3474

Merged

bangqipropel changed the title ~~Update ClusterClaim to v1alpha2~~ [WIP]:Update ClusterClaim to v1alpha2 Jun 8, 2022

luolanzone reviewed Jun 10, 2022

View reviewed changes

bangqipropel force-pushed the CRD_v1alpha2 branch from 10abcb4 to aa8de7b Compare June 13, 2022 22:42

bangqipropel force-pushed the CRD_v1alpha2 branch 2 times, most recently from 8916036 to 953f36c Compare June 14, 2022 08:20

luolanzone reviewed Jun 14, 2022

View reviewed changes

bangqipropel force-pushed the CRD_v1alpha2 branch 3 times, most recently from c414b2b to d2ad946 Compare June 14, 2022 22:49

bangqipropel changed the title ~~[WIP]:Update ClusterClaim to v1alpha2~~ Update ClusterClaim to v1alpha2 Jun 15, 2022

luolanzone reviewed Jun 16, 2022

View reviewed changes

jianjuns reviewed Jun 22, 2022

View reviewed changes

bangqipropel force-pushed the CRD_v1alpha2 branch from 62be426 to 3a74e03 Compare June 26, 2022 08:48

bangqipropel linked an issue Jun 26, 2022 that may be closed by this pull request

ClusterID uniqueness validation in a ClusterSet #3328

Closed

luolanzone reviewed Jun 28, 2022

View reviewed changes

multicluster/build/yamls/antrea-multicluster-leader-global.yml Outdated Show resolved Hide resolved

luolanzone reviewed Jun 28, 2022

View reviewed changes

multicluster/pkg/client/informers/externalversions/multicluster/v1alpha1/interface.go Show resolved Hide resolved

multicluster/pkg/client/listers/multicluster/v1alpha1/expansion_generated.go Show resolved Hide resolved

bangqipropel force-pushed the CRD_v1alpha2 branch 2 times, most recently from 117a518 to 108bf2f Compare June 29, 2022 01:19

tnqn reviewed Jun 30, 2022

View reviewed changes

bangqipropel force-pushed the CRD_v1alpha2 branch from 108bf2f to 3f1e675 Compare July 5, 2022 22:09

Update ClusterClaim to v1alpha2

c00d4fe

1. ClusterClaim upgraded to v1alpha2, with removing the Name of it 2. metadata.name in ClusterClaim can only be `id.k8s.io` or `clusterset.k8s.io` 3. Deprecate ClusterClaim version v1alpha1 Signed-off-by: zbangqi <[email protected]>

bangqipropel force-pushed the CRD_v1alpha2 branch from 3f1e675 to c00d4fe Compare July 5, 2022 22:16

tnqn approved these changes Jul 6, 2022

View reviewed changes

jianjuns merged commit b766cdc into antrea-io:main Jul 6, 2022

luolanzone mentioned this pull request Jun 7, 2023

Remove ClusterClaim and update ClusterSet version #5001

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update ClusterClaim to v1alpha2 #3755

Update ClusterClaim to v1alpha2 #3755

bangqipropel commented May 9, 2022 •

edited

Loading

codecov-commenter commented May 9, 2022 •

edited

Loading

bangqipropel commented May 22, 2022

luolanzone commented Jun 14, 2022 •

edited

Loading

luolanzone commented Jun 14, 2022

bangqipropel commented Jun 16, 2022

luolanzone Jun 16, 2022

luolanzone Jun 16, 2022

luolanzone commented Jun 16, 2022 •

edited

Loading

bangqipropel commented Jun 22, 2022

bangqipropel commented Jun 22, 2022

jianjuns left a comment

bangqipropel commented Jun 22, 2022

luolanzone commented Jun 23, 2022

bangqipropel commented Jun 26, 2022

bangqipropel commented Jun 26, 2022

bangqipropel commented Jun 27, 2022

tnqn commented Jun 28, 2022

bangqipropel commented Jun 29, 2022

luolanzone commented Jun 29, 2022

luolanzone commented Jun 29, 2022

luolanzone commented Jun 30, 2022

tnqn left a comment

tnqn Jun 30, 2022

bangqipropel Jul 5, 2022 •

edited

Loading

tnqn Jul 6, 2022

luolanzone commented Jul 4, 2022

bangqipropel commented Jul 5, 2022

bangqipropel commented Jul 5, 2022

tnqn left a comment

jianjuns commented Jul 6, 2022

Update ClusterClaim to v1alpha2 #3755

Update ClusterClaim to v1alpha2 #3755

Conversation

bangqipropel commented May 9, 2022 • edited Loading

codecov-commenter commented May 9, 2022 • edited Loading

Codecov Report

bangqipropel commented May 22, 2022

luolanzone commented Jun 14, 2022 • edited Loading

luolanzone commented Jun 14, 2022

bangqipropel commented Jun 16, 2022

luolanzone Jun 16, 2022

Choose a reason for hiding this comment

luolanzone Jun 16, 2022

Choose a reason for hiding this comment

luolanzone commented Jun 16, 2022 • edited Loading

bangqipropel commented Jun 22, 2022

bangqipropel commented Jun 22, 2022

jianjuns left a comment

Choose a reason for hiding this comment

bangqipropel commented Jun 22, 2022

luolanzone commented Jun 23, 2022

bangqipropel commented Jun 26, 2022

bangqipropel commented Jun 26, 2022

bangqipropel commented Jun 27, 2022

tnqn commented Jun 28, 2022

bangqipropel commented Jun 29, 2022

luolanzone commented Jun 29, 2022

luolanzone commented Jun 29, 2022

luolanzone commented Jun 30, 2022

tnqn left a comment

Choose a reason for hiding this comment

tnqn Jun 30, 2022

Choose a reason for hiding this comment

bangqipropel Jul 5, 2022 • edited Loading

Choose a reason for hiding this comment

tnqn Jul 6, 2022

Choose a reason for hiding this comment

luolanzone commented Jul 4, 2022

bangqipropel commented Jul 5, 2022

bangqipropel commented Jul 5, 2022

tnqn left a comment

Choose a reason for hiding this comment

jianjuns commented Jul 6, 2022

bangqipropel commented May 9, 2022 •

edited

Loading

codecov-commenter commented May 9, 2022 •

edited

Loading

luolanzone commented Jun 14, 2022 •

edited

Loading

luolanzone commented Jun 16, 2022 •

edited

Loading

bangqipropel Jul 5, 2022 •

edited

Loading