Extend AntreaConfig to Support Antrea-NSX Registration Workflow #3816

liu4480 · 2022-11-02T06:00:29Z

What this PR does / why we need it

This patch extends antreaConfig to support antreaNsx, once antreaNsx is enabled in antreaConfig, addon controller will

create nsxServiceAccount
create providerServiceAccount
update values.yaml in xxxx-antrea-package secret with antreaNsx enabled

upon the workload cluster is deleted, addon controller will

delete nsxServiceAccount
delete providerServiceAccount
delete xxxx-antrea-package secret

Which issue(s) this PR fixes

Fixes #

Describe testing done for PR

create a cluster in namespace antrea-test
edit antreaConfig in antrea-test, add

  antreaNsx:
    enable: true

check if nsxServiceAccount and providerServiceAccount are created in antrea-test
check if there is antreaNsx enabled in secret whose name contains antrea-package in its data, use based64 -d to decode the content
delete the cluster, check if nsxServiceAccount and providerServiceAccount are deleted
check if secret in step 4 is deleted

  antreaNsx:
    enable: true

Release note

Additional information

Special notes for your reviewer

liu4480 · 2022-11-03T02:14:00Z

/test install-vc7

alfredthenarwhal · 2022-11-03T02:14:05Z

@liu4480: /test install-vc7

Tests can be triggered only by the trusted reviewers (users mentioned in CODEOWNERS file).

codecov · 2022-11-03T02:16:48Z

Codecov Report

Merging #3816 (4713aed) into main (6dabd94) will decrease coverage by 0.78%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3816      +/-   ##
==========================================
- Coverage   48.53%   47.75%   -0.79%     
==========================================
  Files         446      469      +23     
  Lines       44195    45659    +1464     
==========================================
+ Hits        21449    21803     +354     
- Misses      20696    21790    +1094     
- Partials     2050     2066      +16

Impacted Files	Coverage Δ
cmd/cli/plugin/cluster/get_machinehealthcheck.go	`11.42% <0.00%> (ø)`
cmd/cli/plugin/cluster/scale.go	`17.85% <0.00%> (ø)`
.../cli/plugin/cluster/set_machinehealthcheck_node.go	`23.33% <0.00%> (ø)`
cmd/cli/plugin/cluster/set_node_pool.go	`14.63% <0.00%> (ø)`
cmd/cli/plugin/cluster/set_machinehealthcheck.go	`23.33% <0.00%> (ø)`
cmd/cli/plugin/cluster/get.go	`6.27% <0.00%> (ø)`
...in/cluster/set_machinehealthcheck_control_plane.go	`21.21% <0.00%> (ø)`
cmd/cli/plugin/cluster/kubeconfig_get.go	`8.82% <0.00%> (ø)`
cmd/cli/plugin/cluster/upgrade.go	`58.94% <0.00%> (ø)`
cmd/cli/plugin/cluster/get_node_pools.go	`10.52% <0.00%> (ø)`
... and 15 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

navidshaikh · 2022-11-04T10:03:01Z

/test install-vc7

alfredthenarwhal · 2022-11-04T12:31:36Z

Build failed! Build no: 3117

liu4480 · 2022-11-07T01:47:10Z

/test install-vc7

alfredthenarwhal · 2022-11-07T01:47:15Z

@liu4480: /test install-vc7

Tests can be triggered only by the trusted reviewers (users mentioned in CODEOWNERS file).

navidshaikh · 2022-11-07T05:32:48Z

/test install-vc7

alfredthenarwhal · 2022-11-07T08:06:37Z

Tests failed! Build no: 3126

liu4480 · 2022-11-14T06:38:27Z

/test install-vc7

liu4480 · 2022-11-15T10:43:02Z

/test install-vc7

alfredthenarwhal · 2022-11-15T11:44:15Z

@liu4480: /test install-vc7
Commit: 4ce571a

Build failed! Build no: 3206

liu4480 · 2022-11-16T03:32:33Z

/test install-vc7

...anager/bundle/config/upstream/addonconfigscrds/csi.tanzu.vmware.com_azurefilecsiconfigs.yaml

apis/addonconfigs/cni/v1alpha1/antreaconfig_types.go

addons/controllers/antreaconfig_controller_test.go

addons/controllers/antrea/antreaconfig_controller.go

addons/controllers/antreaconfig_controller_test.go

This patch extends antreaConfig to support antreaNsx, once antreaNsx is enabled in antreaConfig, addon controller will 1. create nsxServiceAccount 2. create providerServiceAccount 3. update values.yaml in xxxx-antrea-package secret with antreaNsx enabled upon the workload cluster is deleted, addon controller will 1. delete nsxServiceAccount 2. delete providerServiceAccount 3. delete xxxx-antrea-package secret Signed-off-by: Bin Liu <[email protected]>

Signed-off-by: Bin Liu <[email protected]>

jeffwubj · 2022-12-09T07:39:09Z

addons/controllers/antrea/antreaconfig_util.go

 }

 type antrea struct {
 	AntreaConfigDataValue antreaConfigDataValue `yaml:"config,omitempty"`
 }

+type antreaNsx struct {


should antrea_configs_exist in clusterbootstrap.yaml be updated to include these ?

Yes, it should be in another pull request #4098

sorry that I misunderstood your comments. because this is not default setting for clusterbootstrap, when user wants to use this feature, they can edit antreaConfig manually. @jeffwubj

liu4480 · 2023-01-03T07:29:03Z

close this pr as it is based on a forked repo. #4219 is already proposed

liu4480 requested review from a team as code owners November 2, 2022 06:00

vmwclabot added the cla-not-required label Nov 2, 2022

liu4480 force-pushed the extend-antreaConfig branch from 1cb06b9 to 56d1817 Compare November 3, 2022 01:00

liu4480 force-pushed the extend-antreaConfig branch from 56d1817 to 2b847a0 Compare November 7, 2022 01:13

liu4480 force-pushed the extend-antreaConfig branch 7 times, most recently from 8469a45 to f5601d4 Compare November 14, 2022 06:37

liu4480 force-pushed the extend-antreaConfig branch 2 times, most recently from e0d0b03 to 57c9914 Compare November 15, 2022 09:58

liu4480 changed the title ~~WIP: Extend antrea config~~ Extend antrea config Nov 15, 2022

liu4480 force-pushed the extend-antreaConfig branch from 57c9914 to 4ce571a Compare November 15, 2022 10:42

liu4480 force-pushed the extend-antreaConfig branch from 4ce571a to e63d375 Compare November 16, 2022 02:42

liu4480 force-pushed the extend-antreaConfig branch 6 times, most recently from d7c47aa to 1614dc0 Compare December 2, 2022 01:55