VPC Support in AKO #1416

abhishekbsingh · 2024-04-29T06:59:34Z

Overview of behaviour changes and how they are implemented - https://confluence.eng.vmware.com/display/NSBU/AKO+Changes+to+support+NSX+VPCs

Dhivyaaj · 2024-04-29T06:59:37Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

Dhivyaaj · 2024-04-29T07:10:36Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

Dhivyaaj · 2024-04-29T09:42:34Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-04-29T09:54:12Z

build ako

Dhivyaaj · 2024-04-29T11:31:38Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-04-29T11:31:46Z

build ako

Dhivyaaj · 2024-04-29T15:43:43Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-04-29T15:44:09Z

build ako

abhishekbsingh · 2024-04-29T16:48:41Z

build ako

Dhivyaaj · 2024-05-08T16:28:01Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-08T16:29:08Z

skip jira-id-check

abhishekbsingh · 2024-05-08T16:29:21Z

build ako

Dhivyaaj · 2024-05-08T16:52:26Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-08T16:52:56Z

build ako

Dhivyaaj · 2024-05-08T17:06:00Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

Dhivyaaj · 2024-05-09T07:43:35Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-09T07:54:42Z

build ako

abhishekbsingh · 2024-05-09T10:54:38Z

skip jira-id-check

Dhivyaaj · 2024-05-09T18:19:29Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

Dhivyaaj · 2024-05-10T11:40:36Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-13T06:15:17Z

build ako

abhishekbsingh · 2024-05-13T08:32:22Z

build ako

Dhivyaaj · 2024-05-20T06:16:53Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-23T10:32:16Z

build ako

abhishekbsingh · 2024-05-23T10:56:43Z

build ako

Dhivyaaj · 2024-05-25T02:50:01Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

Dhivyaaj · 2024-05-25T03:16:03Z

No JIRA Ids found for the PR. Jira id is mandatory to update fix version in jira. Please update respective Jira id in PR title or commit message if the PR is intented for default branches of repo. For mandatory exemptions, comment trigger phrase 'skip jira-id-check' in PR. For manual trigger, comment trigger phrase 'run jira-id-check' in PR.

abhishekbsingh · 2024-05-25T03:22:51Z

build ako

abhishekbsingh · 2024-05-25T16:56:36Z

build ako

abhishekbsingh · 2024-05-27T05:48:27Z

build ako

arihantg · 2024-05-27T14:53:50Z

internal/k8s/validator.go

@@ -359,6 +359,9 @@ func (l *leader) ValidateAviInfraSetting(key string, infraSetting *akov1beta1.Av
 	if infraSetting.Spec.SeGroup.Name != "" {
 		refData[infraSetting.Spec.SeGroup.Name] = "ServiceEngineGroup"
 	}
+	if infraSetting.Spec.Tenant.Name != nil && !utils.IsVCFCluster() {
+		refData[*infraSetting.Spec.Tenant.Name] = "Tenant"


I think presense of tenant ref should be validated only in admin tenant.

Presently, every ref in CRs is validated in Admin tenant only. Will handle CRD validation in subsequent PRs

abhishekbsingh · 2024-05-29T04:38:36Z

build ako

abhishekbsingh · 2024-05-29T04:40:45Z

build ako

akshayhavile · 2024-05-30T06:46:51Z

ako-clean/cleanup.go

+	akoControlConfig.SetAKOInstanceFlag(true)
+	lib.SetNamePrefix("")
+	lib.SetAKOUser(lib.AKOPrefix)
+	//utils.AviLog.SetLevel("INFO")


please remove commented code.

akshayhavile · 2024-05-30T06:57:27Z

ako-clean/cleanup.go

+	ctrlPropCache := utils.SharedCtrlProp()
+	ctrlPropCache.PopulateCtrlProp(ctrlProps)
+	if cfg.useEnvoy {
+		ctrlPropCache.PopulateCtrlAPIScheme("http")


should it be https for secure connection?

akshayhavile · 2024-05-30T07:09:05Z

cmd/clean-main/main.go

+	flag.StringVar(&password, "password", "", "NSX ALB Controller authentication password")
+	flag.StringVar(&albCtrlCert, "cacert", "", "NSX ALB Controller authentication certificate")
+	flag.StringVar(&clusterID, "cluster-id", "", "AKO cluster name")
+	flag.BoolVar(&useEnvoy, "use-envoy", false, "Use Envoy sidecar proxy in VCSA")


what is use of envoy?

akshayhavile · 2024-05-30T07:10:18Z

cmd/clean-main/main.go

+
+	ctx, cancelFunc := context.WithTimeout(context.Background(), 120*time.Second)
+	defer cancelFunc()
+	err := cfg.Cleanup(ctx)


why are we deleting all avi resources? There is deleteConfig functionality present in AKO. Can we use that? It deletes all resources created by current AKO. Can we use that?

akshayhavile · 2024-05-31T05:42:52Z

ako-infra/avirest/netinfo_handler.go

+
+func getInfraSettingNameFromT1LR(lr string) string {
+	arr := strings.Split(lr, "/")
+	infraSettingName := arr[len(arr)-1]


I assume lr has specific format and string split should result in non-zero len array. Else this line will cause index out of range error.

akshayhavile · 2024-05-31T06:35:29Z

internal/lib/utils.go

+	if len(infraSettingCRs) == 0 {
+		return nil
+	}
+	namespaces, err := utils.GetInformers().NSInformer.Lister().List(labels.Set(nil).AsSelector())


Can we maintain map of aviinfrasetting to namespace during namespace event handler or other add event so that it will be faster to delete not required entries?

akshayhavile · 2024-05-31T06:43:14Z

ako-infra/avirest/vpc_handler.go

+	}
+}
+
+func (v *VPCHandler) SyncLSLRNetwork() {


There are multiple SyncLSLRNetwork functions (one in VCF context and one in VPC context) to update cloud with tier1lr. Will it possible that it will create conflict?

I think, only one will be enabled due lib.IsVPCmode() check.

akshayhavile · 2024-05-31T06:50:31Z

cmd/infra-main/main.go

+	if err != nil {
+		utils.AviLog.Fatalf("Error building AKO CRD v1beta1 clientset: %s", err.Error())
+	}
+
 	utils.AviLog.Infof("Successfully created kube client for ako-infra")


We can move this message before line number 77.

akshayhavile · 2024-05-31T06:56:36Z

internal/cache/avi_ctrl_clients.go

+		lib.AKOControlConfig().SetControllerVersion(currentControllerVersion)
+		ctrlVersion = currentControllerVersion
+	}
+	// set the tenant and controller version in avisession obj


Comment should be modified as we are setting up controller version only.

akshayhavile · 2024-05-31T07:09:21Z

internal/cache/controller_obj_cache.go

+		err = c.AviCloudPropertiesPopulate(client[0], cloud)
+		if err != nil {
+			return vsCacheCopy, allVsKeys, err
+		}
 	}
 	if lib.GetDeleteConfigMap() {


@arihantg: We should test deletConfig functionality with tenancy into picture?

abhishekbsingh added the do-not-merge label Apr 29, 2024

vmwclabot added the cla-not-required label Apr 29, 2024

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 485c9bb to d8b294f Compare April 29, 2024 07:10

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 1fa2ece to 281722b Compare April 29, 2024 11:31

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 281722b to 1ddc34e Compare April 29, 2024 15:43

Add Rest Op to Slow retry if Network not found in Avi

9e01503

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 1ddc34e to df8276b Compare May 8, 2024 16:27

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from df8276b to 1b1e1d7 Compare May 8, 2024 16:52

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 1b1e1d7 to f7c5437 Compare May 8, 2024 17:05

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from f7c5437 to 1f32ac6 Compare May 9, 2024 07:43

abhishekbsingh requested a review from akshayhavile May 9, 2024 07:55

abhishekbsingh removed the do-not-merge label May 9, 2024

abhishekbsingh requested a review from apalsule May 9, 2024 07:55

abhishekbsingh requested review from aaha97, DixitAakash and pkoshtavmware May 9, 2024 07:55

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 1f32ac6 to d653c48 Compare May 10, 2024 11:40

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from d653c48 to 38871c8 Compare May 20, 2024 06:16

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from 38871c8 to b102030 Compare May 25, 2024 02:49

abhishekbsingh added 6 commits May 25, 2024 08:44

Support for NSX VPCs

9fa589f

Do not use NS infra setting in avi object names

f33cf6a

UT changes for multitenancy and AKO Infra

33ffc0a

Moved to VPCNetworkConfig CR from VPC CR

617b254

Avi Cleanup Script for WCP

d938781

AviInfraSetting CRD change

341d5db

abhishekbsingh force-pushed the topic/abishekb/nsx-vpcs-in-ako branch from b102030 to 341d5db Compare May 25, 2024 03:15

arihantg reviewed May 27, 2024

View reviewed changes

akshayhavile reviewed Jun 2, 2024

View reviewed changes

VPC Support in AKO #1416

Are you sure you want to change the base?

VPC Support in AKO #1416

Conversation

abhishekbsingh commented Apr 29, 2024 • edited

Dhivyaaj commented Apr 29, 2024

Dhivyaaj commented Apr 29, 2024

Dhivyaaj commented Apr 29, 2024

abhishekbsingh commented Apr 29, 2024

Dhivyaaj commented Apr 29, 2024

abhishekbsingh commented Apr 29, 2024

Dhivyaaj commented Apr 29, 2024

abhishekbsingh commented Apr 29, 2024

abhishekbsingh commented Apr 29, 2024

Dhivyaaj commented May 8, 2024

abhishekbsingh commented May 8, 2024

abhishekbsingh commented May 8, 2024

Dhivyaaj commented May 8, 2024

abhishekbsingh commented May 8, 2024

Dhivyaaj commented May 8, 2024

Dhivyaaj commented May 9, 2024

abhishekbsingh commented May 9, 2024

abhishekbsingh commented May 9, 2024

Dhivyaaj commented May 9, 2024

Dhivyaaj commented May 10, 2024

abhishekbsingh commented May 13, 2024

abhishekbsingh commented May 13, 2024

Dhivyaaj commented May 20, 2024

abhishekbsingh commented May 23, 2024

abhishekbsingh commented May 23, 2024

Dhivyaaj commented May 25, 2024

Dhivyaaj commented May 25, 2024

abhishekbsingh commented May 25, 2024

abhishekbsingh commented May 25, 2024

abhishekbsingh commented May 27, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abhishekbsingh commented May 29, 2024

abhishekbsingh commented May 29, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abhishekbsingh commented Apr 29, 2024 •

edited