test: fix ut and refine examples

fix
kubernetes-sigs · Oct 13, 2024 · d3da6b2 · d3da6b2
1 parent f337f3f
commit d3da6b2
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 166 deletions.
diff --git a/deploy/example-cc/cc-deployment.yaml b/deploy/example-cc/cc-deployment.yaml
diff --git a/deploy/example-cc/cc-nginx-pod-azurefile.yaml b/deploy/example-cc/cc-nginx-pod-azurefile.yaml
diff --git a/deploy/example-cc/shared-pvc-across-runtimes.yaml b/deploy/example-cc/shared-pvc-across-runtimes.yaml
diff --git a/deploy/example-cc/cc-statefulset.yaml → deploy/example/kata-cc/statefulset.yaml b/deploy/example-cc/cc-statefulset.yaml → deploy/example/kata-cc/statefulset.yaml
@@ -37,7 +37,7 @@ spec:
     - metadata:
         name: persistent-storage
       spec:
-        storageClassName: azurefile-csi
+        storageClassName: azurefile-csi-kata-cc
         accessModes: ["ReadWriteMany"]
         resources:
           requests:

diff --git a/deploy/example/kata-cc/storageclass-azurefile-kata-cc.yaml b/deploy/example/kata-cc/storageclass-azurefile-kata-cc.yaml
@@ -0,0 +1,20 @@
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: azurefile-csi-kata-cc
+provisioner: file.csi.azure.com
+allowVolumeExpansion: true
+parameters:
+  skuName: Premium_LRS  # available values: Premium_LRS, Premium_ZRS, Standard_LRS, Standard_GRS, Standard_ZRS, Standard_RAGRS, Standard_RAGZRS
+  enableKataCCMount: "true"
+reclaimPolicy: Delete
+volumeBindingMode: Immediate
+mountOptions:
+  - dir_mode=0777
+  - file_mode=0777
+  - mfsymlinks
+  - cache=strict  # https://linux.die.net/man/8/mount.cifs
+  - nosharesock  # reduce probability of reconnect race
+  - actimeo=30  # reduce latency for metadata-heavy workload
+  - nobrl  # disable sending byte range lock requests to the server and for applications which have challenges with posix locks
diff --git a/deploy/rbac-csi-azurefile-node.yaml b/deploy/rbac-csi-azurefile-node.yaml
@@ -32,9 +32,7 @@ roleRef:
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-{{ .Values.rbac.name }}-node-katacc-role
-  labels:
-    {{- include "azurefile.labels" . | nindent 4 }}
+  name: csi-azurefile-node-katacc-role
 rules:
   - apiGroups: [""]
     resources: ["pods"]
@@ -46,15 +44,13 @@ rules:
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: csi-{{ .Values.rbac.name }}-node-katacc-binding
-  labels:
-    {{- include "azurefile.labels" . | nindent 4 }}
+  name: csi-azurefile-node-katacc-binding
 subjects:
   - kind: ServiceAccount
-    name: {{ .Values.serviceAccount.node }}
-    namespace: {{ .Release.Namespace }}
+    name: csi-azurefile-node-sa
+    namespace: kube-system
 roleRef:
   kind: ClusterRole
-  name: csi-{{ .Values.rbac.name }}-node-katacc-role
+  name: csi-azurefile-node-katacc-role
   apiGroup: rbac.authorization.k8s.io
 ---
diff --git a/hack/verify-yamllint.sh b/hack/verify-yamllint.sh
@@ -21,7 +21,7 @@ fi
 LOG=/tmp/yamllint.log
 helmPath=charts/latest/azurefile-csi-driver/templates
 
-for path in "deploy/*.yaml" "deploy/example/*.yaml" "deploy/example/snapshot/*.yaml" "deploy/example/disk/*.yaml" "deploy/example/windows/*.yaml" "deploy/example/metrics/*.yaml" "deploy/example/largeFileShares/*.yaml" "deploy/example/smb-provisioner/*.yaml" "deploy/example/cloning/*.yaml" "deploy/example-cc/*.yaml"
+for path in "deploy/*.yaml" "deploy/example/*.yaml" "deploy/example/snapshot/*.yaml" "deploy/example/disk/*.yaml" "deploy/example/windows/*.yaml" "deploy/example/metrics/*.yaml" "deploy/example/largeFileShares/*.yaml" "deploy/example/smb-provisioner/*.yaml" "deploy/example/cloning/*.yaml" "deploy/example/kata-cc/*.yaml"
 do
     echo "checking yamllint under path: $path ..."
     yamllint -f parsable $path | grep -v "line too long" > $LOG

diff --git a/pkg/azurefile/nodeserver_test.go b/pkg/azurefile/nodeserver_test.go
@@ -341,14 +341,17 @@ func TestNodeUnpublishVolume(t *testing.T) {
 			expectedErr: testutil.TestError{
 				DefaultError: status.Error(codes.Internal, fmt.Sprintf("failed to unmount target %s: fake IsLikelyNotMountPoint: fake error", errorTarget)),
 			},
+			setup: func() {
+				if runtime.GOOS == "windows" {
+					mockDirectVolume.EXPECT().Remove(errorTarget).Return(nil)
+				}
+			},
 		},
 		{
 			desc: "[Success] Valid request",
 			req:  csi.NodeUnpublishVolumeRequest{TargetPath: targetFile, VolumeId: "vol_1"},
 			setup: func() {
-				if runtime.GOOS != "windows" {
-					mockDirectVolume.EXPECT().Remove(targetFile).Return(nil)
-				}
+				mockDirectVolume.EXPECT().Remove(targetFile).Return(nil)
 			},
 			expectedErr: testutil.TestError{},
 		},
@@ -888,14 +891,17 @@ func TestNodeUnstageVolume(t *testing.T) {
 			expectedErr: testutil.TestError{
 				DefaultError: status.Error(codes.Internal, fmt.Sprintf("failed to unmount staging target %v: fake IsLikelyNotMountPoint: fake error", errorTarget)),
 			},
+			setup: func() {
+				if runtime.GOOS == "windows" {
+					mockDirectVolume.EXPECT().Remove(errorTarget).Return(nil)
+				}
+			},
 		},
 		{
 			desc: "[Success] Valid request",
 			req:  csi.NodeUnstageVolumeRequest{StagingTargetPath: targetFile, VolumeId: "vol_1"},
 			setup: func() {
-				if runtime.GOOS != "windows" {
-					mockDirectVolume.EXPECT().Remove(targetFile).Return(nil)
-				}
+				mockDirectVolume.EXPECT().Remove(targetFile).Return(nil)
 			},
 			expectedErr: testutil.TestError{},
 		},