Use real VPC path in NSXServiceAccount

Signed-off-by: Kumar Atish <kumar.atish@broadcom.com>

Author: Atish-iaf

cmd/main.go

@@ -254,7 +254,7 @@ func startServiceController(mgr manager.Manager, nsxClient *nsx.Client) {
 
 	// Add the NSXServiceAccount controller.
 	if cf.EnableAntreaNSXInterworking {
-		reconcilerList = append(reconcilerList, nsxserviceaccountcontroller.NewNSXServiceAccountReconciler(mgr, commonService))
+		reconcilerList = append(reconcilerList, nsxserviceaccountcontroller.NewNSXServiceAccountReconciler(mgr, commonService, vpcService))
 	}
 
 	if restoreMode {

pkg/clean/clean.go

@@ -185,7 +185,7 @@ func InitializeCleanupService(cf *config.NSXOperatorConfig, nsxClient *nsx.Clien
 	}
 	wrapInitializeNSXServiceAccount := func(service common.Service) cleanupFunc {
 		return func() (interface{}, error) {
-			return nsxserviceaccount.InitializeNSXServiceAccount(service)
+			return nsxserviceaccount.InitializeNSXServiceAccount(service, vpcService)
 		}
 	}
 

pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go

@@ -314,14 +314,14 @@ func (r *NSXServiceAccountReconciler) StartController(mgr ctrl.Manager, _ webhoo
 	return nil
 }
 
-func NewNSXServiceAccountReconciler(mgr ctrl.Manager, commonService servicecommon.Service) *NSXServiceAccountReconciler {
+func NewNSXServiceAccountReconciler(mgr ctrl.Manager, commonService servicecommon.Service, vpcService servicecommon.VPCServiceProvider) *NSXServiceAccountReconciler {
 	log.Info("Initializing NSXServiceAccountController")
 	nsxServiceAccountReconcile := &NSXServiceAccountReconciler{
 		Client:   mgr.GetClient(),
 		Scheme:   mgr.GetScheme(),
 		Recorder: mgr.GetEventRecorderFor("nsxserviceaccount-controller"),
 	}
-	nsxServiceAccountService, err := nsxserviceaccount.InitializeNSXServiceAccount(commonService)
+	nsxServiceAccountService, err := nsxserviceaccount.InitializeNSXServiceAccount(commonService, vpcService)
 	if err != nil {
 		log.Error(err, "Failed to initialize service", "controller", "NSXServiceAccount")
 		os.Exit(1)

pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go

@@ -36,6 +36,7 @@ import (
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx"
 	servicecommon "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/nsxserviceaccount"
+	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/vpc"
 )
 
 type fakeRecorder struct {
@@ -630,7 +631,8 @@ func TestNSXServiceAccountReconciler_StartController(t *testing.T) {
 		return
 	})
 	defer patches.Reset()
-	reconciler := NewNSXServiceAccountReconciler(mockMgr, service)
+	vpcService := &vpc.VPCService{}
+	reconciler := NewNSXServiceAccountReconciler(mockMgr, service, vpcService)
 	err := reconciler.StartController(mockMgr, nil)
 	assert.Nil(t, err)
 }

pkg/nsx/services/nsxserviceaccount/cluster.go

@@ -63,16 +63,20 @@ type NSXServiceAccountService struct {
 	common.Service
 	PrincipalIdentityStore   *PrincipalIdentityStore
 	ClusterControlPlaneStore *ClusterControlPlaneStore
+	VPCService               common.VPCServiceProvider
 }
 
 // InitializeNSXServiceAccount sync NSX resources
-func InitializeNSXServiceAccount(service common.Service) (*NSXServiceAccountService, error) {
+func InitializeNSXServiceAccount(service common.Service, vpcService common.VPCServiceProvider) (*NSXServiceAccountService, error) {
 	wg := sync.WaitGroup{}
 	wgDone := make(chan bool)
 	fatalErrors := make(chan error)
 
 	wg.Add(2)
-	nsxServiceAccountService := &NSXServiceAccountService{Service: service}
+	nsxServiceAccountService := &NSXServiceAccountService{
+		Service:    service,
+		VPCService: vpcService,
+	}
 
 	nsxServiceAccountService.SetUpStore()
 	go nsxServiceAccountService.InitializeResourceStore(&wg, fatalErrors, common.ResourceTypePrincipalIdentity, nil, nsxServiceAccountService.PrincipalIdentityStore)
@@ -106,10 +110,17 @@ func (s *NSXServiceAccountService) SetUpStore() {
 func (s *NSXServiceAccountService) CreateOrUpdateNSXServiceAccount(ctx context.Context, obj *v1alpha1.NSXServiceAccount) error {
 	clusterName := s.getClusterName(obj.Namespace, obj.Name)
 	normalizedClusterName := util.NormalizeId(clusterName)
-	// TODO: Use WCPConfig.NSXTProject as project when WCPConfig.EnableWCPVPCNetwork is true
-	project := s.NSXConfig.CoeConfig.Cluster
-	vpcName := obj.Namespace + "-default-vpc"
-	vpcPath := fmt.Sprintf("/orgs/default/projects/%s/vpcs/%s", util.NormalizeId(project), vpcName)
+	var vpcPath string
+	if obj.Status.VPCPath != "" {
+		vpcPath = obj.Status.VPCPath
+	} else {
+		vpcInfo := s.VPCService.ListVPCInfo(obj.Namespace)
+		if len(vpcInfo) > 0 {
+			vpcPath = vpcInfo[0].GetVPCPath()
+		} else {
+			return fmt.Errorf("failed to listVPCInfo for namespace %s", obj.Namespace)
+		}
+	}
 
 	// get proxy
 	proxyEndpoints, err := s.getProxyEndpoints(ctx)