Hook logic with new nbc field

Author: jumpinthefire

aks-node-controller/parser/parser.go

@@ -196,6 +196,7 @@ func getCSEEnv(config *aksnodeconfigv1.Configuration) map[string]string {
 		"CSE_TIMEOUT":                                  getCSETimeout(config),
 		"SKIP_WAAGENT_HOLD":                            "true",
 		"NETWORK_ISOLATED_CLUSTER_TEST_MODE":           "false", // temp: needs to be added to config
+		"STANDARD_SECONDARY_NIC_COUNT":                 fmt.Sprintf("%d", config.GetNetworkConfig().GetStandardSecondaryNicCount()),
 	}
 
 	for i, cert := range config.CustomCaCerts {

e2e/scenario_test.go

@@ -3034,6 +3034,7 @@ func Test_Ubuntu2404_SecondaryNIC(t *testing.T) {
 			BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				// Embed scripts in customData instead of using VHD scripts.
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 			},
 			VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
 				addSecondaryNIC(vmss)
@@ -3058,6 +3059,7 @@ func Test_AzureLinuxV3_SecondaryNIC(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 			},
 			VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
 				addSecondaryNIC(vmss)
@@ -3082,6 +3084,7 @@ func Test_Ubuntu2204_SecondaryNIC(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 			},
 			VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
 				addSecondaryNIC(vmss)
@@ -3106,6 +3109,7 @@ func Test_ACL_SecondaryNIC(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(_ *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 			},
 			VMConfigMutator: func(vmss *armcompute.VirtualMachineScaleSet) {
 				vmss.Properties = addTrustedLaunchToVMSS(vmss.Properties)
@@ -3131,6 +3135,7 @@ func Test_Ubuntu2404_SecondaryNIC_DualStack(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(c *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 				if nbc.ContainerService.Properties.FeatureFlags == nil {
 					nbc.ContainerService.Properties.FeatureFlags = &datamodel.FeatureFlags{}
 				}
@@ -3168,6 +3173,7 @@ func Test_Ubuntu2204_SecondaryNIC_DualStack(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(c *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 				if nbc.ContainerService.Properties.FeatureFlags == nil {
 					nbc.ContainerService.Properties.FeatureFlags = &datamodel.FeatureFlags{}
 				}
@@ -3205,6 +3211,7 @@ func Test_AzureLinuxV3_SecondaryNIC_DualStack(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(c *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 				if nbc.ContainerService.Properties.FeatureFlags == nil {
 					nbc.ContainerService.Properties.FeatureFlags = &datamodel.FeatureFlags{}
 				}
@@ -3241,6 +3248,7 @@ func Test_ACL_SecondaryNIC_DualStack(t *testing.T) {
 			SkipScriptlessNBC: true,
 			BootstrapConfigMutator: func(c *Cluster, nbc *datamodel.NodeBootstrappingConfiguration) {
 				nbc.EnableScriptlessCSECmd = false
+				nbc.StandardSecondaryNICCount = 1
 				if nbc.ContainerService.Properties.FeatureFlags == nil {
 					nbc.ContainerService.Properties.FeatureFlags = &datamodel.FeatureFlags{}
 				}

parts/linux/cloud-init/artifacts/cse_cmd.sh

@@ -199,4 +199,5 @@ LOCALDNS_CRITICAL_FQDNS="{{GetLocalDNSCriticalFQDNs}}"
 PRE_PROVISION_ONLY="{{GetPreProvisionOnly}}"
 CSE_TIMEOUT="{{GetCSETimeout}}"
 SKIP_WAAGENT_HOLD="{{GetSkipWaAgentHold}}"
+STANDARD_SECONDARY_NIC_COUNT="{{GetStandardSecondaryNICCount}}"
 /usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"

parts/linux/cloud-init/artifacts/cse_main.sh

@@ -406,8 +406,8 @@ function nodePrep {
     logs_to_events "AKS.CSE.ensureAzureNetworkConfig" ensureAzureNetworkConfig
 
     # Bring up secondary Standard-type NICs (if any) via IMDS metadata.
-    # Can be disabled via VMSS tag "SkipSecondaryNICConfig=true".
-    if [ "$(get_imds_vm_tag_value 'SkipSecondaryNICConfig')" != "true" ]; then
+    # Only runs when the RP signals that secondary NICs were attached.
+    if [ "${STANDARD_SECONDARY_NIC_COUNT}" -gt 0 ] 2>/dev/null; then
         logs_to_events "AKS.CSE.configureSecondaryNICs" configureSecondaryNICs || exit $ERR_SECONDARY_NIC_CONFIG_FAIL
     fi
 

pkg/agent/baker.go

@@ -1431,7 +1431,8 @@ func getContainerServiceFuncMap(config *datamodel.NodeBootstrappingConfiguration
 		"BlockIptables": func() bool {
 			return cs.Properties.OrchestratorProfile.KubernetesConfig.BlockIptables
 		},
-		"EnableScriptlessCSECmd": func() bool { return config.EnableScriptlessCSECmd },
+		"EnableScriptlessCSECmd":          func() bool { return config.EnableScriptlessCSECmd },
+		"GetStandardSecondaryNICCount":    func() int { return config.StandardSecondaryNICCount },
 	}
 }