Merge pull request #2581 from k8s-infra-cherrypick-robot/cherry-pick-2577-to-release-1.33

[release-1.33] azurefile: revert to use virtio-fs for kata pods

Author: k8s-ci-robot

pkg/azurefile/azurefile.go

@@ -1365,5 +1365,5 @@ func isKataNode(ctx context.Context, nodeID string, kubeClient clientset.Interfa
 		return false
 	}
 	klog.V(4).Infof("node(%s) labels: kataVMIsolationLabel(%s), kataRuntimeLabel(%s)", nodeID, kataVMIsolationLabel, kataRuntimeLabel)
-	return strings.EqualFold(kataCCIsolationLabel, "true") || strings.EqualFold(kataVMIsolationLabel, "true") || strings.EqualFold(kataRuntimeLabel, "true")
+	return strings.EqualFold(kataCCIsolationLabel, "true")
 }

pkg/azurefile/azurefile_test.go

@@ -1739,7 +1739,7 @@ func TestIsKataNode(t *testing.T) {
 			nodeName:    "test-node",
 			setupClient: true,
 			labels: map[string]string{
-				"kubernetes.azure.com/kata-mshv-vm-isolation": "true",
+				"kubernetes.azure.com/kata-cc-isolation": "true",
 			},
 			expected: true,
 		},

pkg/azurefile/utils.go

@@ -318,7 +318,6 @@ func isReadOnlyFromCapability(vc *csi.VolumeCapability) bool {
 }
 
 const confidentialRuntimeClassHandler = "kata-cc"
-const kataVMIsolationRuntimeClassHandler = "kata"
 
 // check if runtimeClass is confidential
 func isConfidentialRuntimeClass(ctx context.Context, kubeClient clientset.Interface, runtimeClassName string) (bool, error) {
@@ -335,8 +334,7 @@ func isConfidentialRuntimeClass(ctx context.Context, kubeClient clientset.Interf
 		return false, err
 	}
 	klog.V(4).Infof("runtimeClass %s handler: %s", runtimeClassName, runtimeClass.Handler)
-	return runtimeClass.Handler == confidentialRuntimeClassHandler ||
-		runtimeClass.Handler == kataVMIsolationRuntimeClassHandler, nil
+	return runtimeClass.Handler == confidentialRuntimeClassHandler, nil
 }
 
 // getBackOff returns a backoff object based on the config