[VPC] Add NSX LBS path to VPCInfo and use LB options in NsxConfig

Signed-off-by: gran <gran@vmware.com>
vmware-tanzu · Jun 20, 2024 · db39a20 · db39a20
1 parent fd0eb5a
commit db39a20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/build/yaml/crd/nsx.vmware.com_vpcnetworkconfigurations.yaml b/build/yaml/crd/nsx.vmware.com_vpcnetworkconfigurations.yaml
@@ -112,6 +112,10 @@ spec:
                     name:
                       description: VPC name.
                       type: string
+                    nsxlbspath:
+                      description: NSXLBSPath is the NSX Policy path for the NSX LB
+                        Service path.
+                      type: string
                   required:
                   - name
                   type: object

diff --git a/pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go b/pkg/apis/v1alpha1/vpcnetworkconfiguration_types.go
@@ -60,6 +60,8 @@ type VPCInfo struct {
 	Name string `json:"name"`
 	// AVISESubnetPath is the NSX Policy Path for the AVI SE Subnet.
 	AVISESubnetPath string `json:"lbSubnetPath,omitempty"`
+	// NSXLBSPath is the NSX Policy path for the NSX LB Service path.
+	NSXLBSPath string `json:"nsxlbspath,omitempty"`
 }
 
 // +genclient

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -117,6 +117,8 @@ type NsxConfig struct {
 	EnvoyHost                 string   `ini:"envoy_host"`
 	EnvoyPort                 int      `ini:"envoy_port"`
 	LicenseValidationInterval int      `ini:"license_validation_interval"`
+	UseAVILB                  bool     `ini:"use_avi_lb"`
+	UseNativeLoadBalancer     bool     `ini:"use_native_loadbalancer"`
 }
 
 type K8sConfig struct {
@@ -189,6 +191,7 @@ func LoadConfigFromFile() (*NSXOperatorConfig, error) {
 	if err != nil {
 		return nil, err
 	}
+	nsxOperatorConfig.NsxConfig.UseNativeLoadBalancer = cfg.Section("nsx_v3").Key("use_native_loadbalancer").MustBool(true)
 	err = cfg.Section("k8s").MapTo(nsxOperatorConfig.K8sConfig)
 	if err != nil {
 		return nil, err