Default nconnect mount option for AKS extension

Author: Utkarshjh

operator/controllers/configurator/storage_drivers/anf.go

@@ -20,6 +20,10 @@ import (
 	"github.com/netapp/trident/storage_drivers/azure/api"
 )
 
+const (
+	MountOptionNconnect = "4"
+)
+
 type ANF struct {
 	ANFConfig
 
@@ -199,7 +203,7 @@ func (a *ANF) CreateStorageClass() error {
 	}
 
 	for _, sc := range anfStorageClassMap.SCMap {
-		scYAML := getANFStorageClassYAML(sc, config.AzureNASStorageDriverName, a.TridentNamespace)
+		scYAML := getANFStorageClassYAML(sc, config.AzureNASStorageDriverName, a.TridentNamespace, MountOptionNconnect)
 		err := a.ConfClient.CreateOrPatchObject(confClients.OStorageClass, sc.Name, "", scYAML)
 		if err != nil {
 			return err

operator/controllers/configurator/storage_drivers/yaml_factory.go

@@ -4,6 +4,7 @@ package storage_drivers
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"github.com/netapp/trident/config"
@@ -119,7 +120,7 @@ func constructClientCredentials(clientCred string) string {
 	return cred
 }
 
-func getANFStorageClassYAML(sc ANFStorageClass, backendType, namespace string) string {
+func getANFStorageClassYAML(sc ANFStorageClass, backendType, namespace, nconnect string) string {
 	scYAML := anfStorageClassTemplate
 
 	scYAML = strings.ReplaceAll(scYAML, "{NAME}", sc.Name)
@@ -129,8 +130,11 @@ func getANFStorageClassYAML(sc ANFStorageClass, backendType, namespace string) s
 
 	if sc.NASType == sa.SMB {
 		scYAML = strings.ReplaceAll(scYAML, "{AAD_SECRET}", constructAADSecret(namespace))
+		scYAML = strings.ReplaceAll(scYAML, "{MOUNT_OPTIONS}", "")
 	} else {
 		scYAML = strings.ReplaceAll(scYAML, "{AAD_SECRET}", "")
+		mountOptions := map[string]string{"nconnect": nconnect}
+		scYAML = strings.ReplaceAll(scYAML, "{MOUNT_OPTIONS}", constructMountOptions(mountOptions))
 	}
 
 	return scYAML
@@ -148,6 +152,7 @@ parameters:
   {AAD_SECRET}
 volumeBindingMode: Immediate
 allowVolumeExpansion: true
+{MOUNT_OPTIONS}
 `
 
 func constructAADSecret(namespace string) string {
@@ -157,6 +162,26 @@ func constructAADSecret(namespace string) string {
 	return aadSecret
 }
 
+// constructMountOptions constructs the mount options for the storage class
+func constructMountOptions(mountOptions map[string]string) string {
+	if len(mountOptions) == 0 {
+		return ""
+	}
+
+	keys := make([]string, 0, len(mountOptions))
+	for key := range mountOptions {
+		keys = append(keys, key)
+	}
+	sort.Strings(keys)
+
+	mountOptionsYAML := "mountOptions:\n"
+	for _, key := range keys {
+		mountOptionsYAML += fmt.Sprintf("  - %s=%s\n", key, mountOptions[key])
+	}
+
+	return mountOptionsYAML
+}
+
 // GetVolumeSnapshotClassYAML returns the VolumeSnapshotClass YAML
 func GetVolumeSnapshotClassYAML(name string) string {
 	vscYAML := volumeSnapshotClassTemplate

operator/controllers/configurator/storage_drivers/yaml_factory_test.go

@@ -77,3 +77,34 @@ func TestConstructANFSupportedTopologies(t *testing.T) {
 		})
 	}
 }
+
+func TestConstructMountOptions(t *testing.T) {
+	testCases := []struct {
+		name     string
+		input    map[string]string
+		expected string
+	}{
+		{
+			name:     "No mount options",
+			input:    map[string]string{},
+			expected: "",
+		},
+		{
+			name:     "Single mount option",
+			input:    map[string]string{"key1": "value1"},
+			expected: "mountOptions:\n  - key1=value1\n",
+		},
+		{
+			name:     "Multiple mount options",
+			input:    map[string]string{"key1": "value1", "key2": "value2"},
+			expected: "mountOptions:\n  - key1=value1\n  - key2=value2\n",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			result := constructMountOptions(tc.input)
+			assert.Equal(t, tc.expected, result, "Incorrect mount options string returned")
+		})
+	}
+}