update NetworkConfiguration CR #623

wenqiq · 2024-07-01T10:18:29Z

Create VPC with new VPC API model

Create a Project wenqi-test in NSX UI
Create a namespace

apiVersion: v1
kind: Namespace
metadata:
  annotations:
    nsx.vmware.com/vpc_network_config: wenqi-1
  name: wenqi-1

Create a VPC with a new VPC CRD yaml

apiVersion: nsx.vmware.com/v1alpha1
kind: VPCNetworkConfiguration
metadata:
  name: wenqi-1
spec:
  privateIPs: [10.30.10.0/24]
  defaultSubnetSize: 24
  vpcServiceProfile: /orgs/default/projects/wenqi-test/vpc-service-profiles/default
  nsxProject: /orgs/default/projects/wenqi-test
  vpcConnectivityProfile: /orgs/default/projects/wenqi-test/vpc-connectivity-profiles/default

Check VPC resources in the NSX:

{
    "results": [
        {
            "vpc_connectivity_profile": "/orgs/default/projects/wenqi-test/vpc-connectivity-profiles/default",
            "vpc_service_profile": "/orgs/default/projects/wenqi-test/vpc-service-profiles/default",
            "load_balancer_vpc_endpoint": {
                "enabled": true
            },
            "private_ipv4_blocks": [
                "/orgs/default/projects/wenqi-test/infra/ip-blocks/e13a3582-bf1f-42ec-bc2a-f36f7e26a353_10.30.10.0"
            ],
            "ip_address_type": "IPV4",
            "short_id": "F3na1AVk",
            "resource_type": "Vpc",
            "id": "e13a3582-bf1f-42ec-bc2a-f36f7e26a353",
            "display_name": "vpc-b7b472a5-677d-4515-990f-c4bf9c1a0aa2--wenqi-1",
            "tags": [
                {
                    "scope": "nsx-op/cluster",
                    "tag": "b7b472a5-677d-4515-990f-c4bf9c1a0aa2"
                },
                {
                    "scope": "nsx-op/version",
                    "tag": "1.0.0"
                },
                {
                    "scope": "nsx-op/namespace",
                    "tag": "wenqi-1"
                },
                {
                    "scope": "nsx-op/namespace_uid",
                    "tag": "e13a3582-bf1f-42ec-bc2a-f36f7e26a353"
                }
            ],
            "path": "/orgs/default/projects/wenqi-test/vpcs/e13a3582-bf1f-42ec-bc2a-f36f7e26a353",
            "relative_path": "e13a3582-bf1f-42ec-bc2a-f36f7e26a353",
            "parent_path": "/orgs/default/projects/wenqi-test",
            "unique_id": "a0e79d9e-cbf0-4ff7-ace2-f7a813543901",
            "realization_id": "a0e79d9e-cbf0-4ff7-ace2-f7a813543901",
            "owner_id": "4447cce7-65b6-4fa0-b42c-38e9846747ac",
            "marked_for_delete": false,
            "overridden": false,
            "_system_owned": false,
            "_protection": "REQUIRE_OVERRIDE",
            "_create_time": 1721094651610,
            "_create_user": "wcp-cluster-user-b7b472a5-677d-4515-990f-c4bf9c1a0aa2-eb929be3-7d77-4b34-bf75-586933753a75",
            "_last_modified_time": 1721094652959,
            "_last_modified_user": "wcp-cluster-user-b7b472a5-677d-4515-990f-c4bf9c1a0aa2-eb929be3-7d77-4b34-bf75-586933753a75",
            "_revision": 2
        }
    ],
    "result_count": 1,
    "sort_by": "display_name",
    "sort_ascending": true
}

go.mod

pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go

pkg/controllers/subnet/subnet_controller.go

pkg/apis/nsx.vmware.com/v1alpha1/subnet_types.go

pkg/controllers/subnetset/subnetset_controller.go

build/yaml/crd/nsx.vmware.com_ipaddressallocations.yaml

dantingl · 2024-07-03T07:44:15Z

build/yaml/crd/nsx.vmware.com_subnets.yaml

@@ -56,11 +56,13 @@ spec:
                    type: boolean
                type: object
              accessMode:
+                default: Private


Do we set default here or leverage the default value from NetworkConfiguration CR? @lxiaopei

pkg/nsx/services/vpc/builder.go

build/yaml/samples/nsx_v1alpha1_vpcnetworkconfigurations.yaml

wenqiq · 2024-07-05T01:28:32Z

/e2e

liu4480 · 2024-07-05T02:59:52Z

build/yaml/crd/nsx.vmware.com_subnets.yaml

                description: Access mode of Subnet, accessible only from within VPC
                  or from outside VPC.
                enum:
                - Private
                - Public
+                - Project


wcp changed this to PRIVATE_TGW, @lxiaopei shall this type also needs to change

timdengyun · 2024-07-05T03:02:42Z

pkg/controllers/subnetset/subnetset_controller.go

@@ -75,10 +75,10 @@ func (r *SubnetSetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 					return ResultRequeue, err
 				}
 				if obj.Spec.AccessMode == "" {
-					obj.Spec.AccessMode = v1alpha1.AccessMode(vpcNetworkConfig.DefaultSubnetAccessMode)
+					obj.Spec.AccessMode = v1alpha1.AccessMode(v1alpha1.AccessModePrivate)


I think we should check if this Accessmode is set for POD or VM
For POD subnetset, we should use vpcNetworkconfiguration.PodSubnetAccessMode
like https://github.com/vmware-tanzu/nsx-operator/pull/627/files#diff-ea8fdc4a9adcc30f1ee646f03f10d565526b3a2b6fec57ae9abaa316c14b8d89R114
we check VM subnetset.

I mean you need to check this CR is pod-default subnetset or vm-default subnetset. we should not set pod-default subnetset using vpcNetworkconfiguration.PodSubnetAccessMode

Makefile

timdengyun · 2024-07-10T03:17:47Z

pkg/controllers/subnet/subnet_controller.go

 			if obj.Spec.AccessMode == "" {
-				obj.Spec.AccessMode = v1alpha1.AccessMode(vpcNetworkConfig.DefaultSubnetAccessMode)
+				accessMode := v1alpha1.AccessMode(v1alpha1.AccessModePrivate)


For subnet, we don't need to set PodSubnetAccessMode, since there is no pod subnet created.
subnet is only VM.

For POD, we only have pod-default subnetset. You can confirm with @lxiaopei

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>

zhengxiexie · 2024-07-15T07:19:36Z

BTW, could you check why e2e test not pass?
Pls also attach what tests you have done in comment. Refer #626

wenqiq · 2024-07-15T15:03:28Z

BTW, could you check why e2e test not pass? Pls also attach what tests you have done in comment. Refer #626

As this PR uses the new VPC API and the e2e testbed uses the old NSX version, I think it’s expected that the related test cases would fail.

wenqiq · 2024-07-15T15:05:25Z

@lxiaopei pls help confirm some of the comments.

vmwclabot added the cla-not-required label Jul 1, 2024

wenqiq mentioned this pull request Jul 1, 2024

Update NetworkConfiguration CR with new VPC API #595

Open

dantingl reviewed Jul 2, 2024

View reviewed changes

go.mod Outdated Show resolved Hide resolved

pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go Outdated Show resolved Hide resolved

wenqiq force-pushed the topic/wenqi/upadteCRD branch 2 times, most recently from abf2b3b to e54d5ac Compare July 2, 2024 08:55

wenqiq marked this pull request as ready for review July 2, 2024 09:06

dantingl requested review from lxiaopei and seanpang-vmware July 2, 2024 10:04

timdengyun reviewed Jul 3, 2024

View reviewed changes

pkg/controllers/subnet/subnet_controller.go Outdated Show resolved Hide resolved

pkg/apis/nsx.vmware.com/v1alpha1/subnet_types.go Show resolved Hide resolved

pkg/controllers/subnetset/subnetset_controller.go Outdated Show resolved Hide resolved

dantingl reviewed Jul 3, 2024

View reviewed changes

timdengyun reviewed Jul 4, 2024

View reviewed changes

build/yaml/samples/nsx_v1alpha1_vpcnetworkconfigurations.yaml Outdated Show resolved Hide resolved

wenqiq force-pushed the topic/wenqi/upadteCRD branch from 99bdeda to eb66a4b Compare July 4, 2024 14:05

liu4480 reviewed Jul 5, 2024

View reviewed changes

timdengyun reviewed Jul 5, 2024

View reviewed changes

timdengyun reviewed Jul 9, 2024

View reviewed changes

Makefile Outdated Show resolved Hide resolved

wenqiq force-pushed the topic/wenqi/upadteCRD branch from 6f568f6 to 225e5f5 Compare July 9, 2024 23:56

timdengyun reviewed Jul 10, 2024

View reviewed changes

wenqiq force-pushed the topic/wenqi/upadteCRD branch 2 times, most recently from 759ae3f to 0fe9fb3 Compare July 11, 2024 06:40

update NetworkConfiguration CR with new VPC API

3028d3b

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>

wenqiq force-pushed the topic/wenqi/upadteCRD branch from 0fe9fb3 to 3028d3b Compare July 15, 2024 03:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update NetworkConfiguration CR #623

update NetworkConfiguration CR #623

wenqiq commented Jul 1, 2024 •

edited

Loading

dantingl Jul 3, 2024

wenqiq commented Jul 5, 2024

liu4480 Jul 5, 2024

timdengyun Jul 5, 2024

wenqiq Jul 5, 2024

timdengyun Jul 9, 2024

timdengyun Jul 10, 2024

zhengxiexie commented Jul 15, 2024

wenqiq commented Jul 15, 2024

wenqiq commented Jul 15, 2024

update NetworkConfiguration CR #623

Are you sure you want to change the base?

update NetworkConfiguration CR #623

Conversation

wenqiq commented Jul 1, 2024 • edited Loading

Create VPC with new VPC API model

dantingl Jul 3, 2024

Choose a reason for hiding this comment

wenqiq commented Jul 5, 2024

liu4480 Jul 5, 2024

Choose a reason for hiding this comment

timdengyun Jul 5, 2024

Choose a reason for hiding this comment

wenqiq Jul 5, 2024

Choose a reason for hiding this comment

timdengyun Jul 9, 2024

Choose a reason for hiding this comment

timdengyun Jul 10, 2024

Choose a reason for hiding this comment

zhengxiexie commented Jul 15, 2024

wenqiq commented Jul 15, 2024

wenqiq commented Jul 15, 2024

wenqiq commented Jul 1, 2024 •

edited

Loading