azurefile: add kata-cc-isolation node label check

Author: arc9693

pkg/azurefile/azurefile.go

@@ -1286,28 +1286,28 @@ func (d *Driver) getFileShareClientForSub(subscriptionID string) (fileshareclien
 	return d.cloud.ComputeClientFactory.GetFileShareClientForSub(subscriptionID)
 }
 
-func getNodeInfoFromLabels(ctx context.Context, nodeID string, kubeClient clientset.Interface) (string, string, error) {
+func getNodeInfoFromLabels(ctx context.Context, nodeID string, kubeClient clientset.Interface) (string, string, string, error) {
 	if kubeClient == nil || kubeClient.CoreV1() == nil {
-		return "", "", fmt.Errorf("kubeClient is nil")
+		return "", "", "", fmt.Errorf("kubeClient is nil")
 	}
 
 	node, err := kubeClient.CoreV1().Nodes().Get(ctx, nodeID, metav1.GetOptions{})
 	if err != nil {
-		return "", "", fmt.Errorf("get node(%s) failed with %v", nodeID, err)
+		return "", "", "", fmt.Errorf("get node(%s) failed with %v", nodeID, err)
 	}
 
 	if len(node.Labels) == 0 {
-		return "", "", fmt.Errorf("node(%s) label is empty", nodeID)
+		return "", "", "", fmt.Errorf("node(%s) label is empty", nodeID)
 	}
-	return node.Labels["kubernetes.azure.com/kata-mshv-vm-isolation"], node.Labels["katacontainers.io/kata-runtime"], nil
+	return node.Labels["kubernetes.azure.com/kata-cc-isolation"], node.Labels["kubernetes.azure.com/kata-mshv-vm-isolation"], node.Labels["katacontainers.io/kata-runtime"], nil
 }
 
 func isKataNode(ctx context.Context, nodeID string, kubeClient clientset.Interface) bool {
 	if nodeID == "" {
 		return false
 	}
 
-	kataVMIsolationLabel, kataRuntimeLabel, err := getNodeInfoFromLabels(ctx, nodeID, kubeClient)
+	kataCCIsolationLabel, kataVMIsolationLabel, kataRuntimeLabel, err := getNodeInfoFromLabels(ctx, nodeID, kubeClient)
 
 	if err != nil {
 		klog.Warningf("failed to get node info from labels: %v", err)
@@ -1316,5 +1316,5 @@ func isKataNode(ctx context.Context, nodeID string, kubeClient clientset.Interfa
 
 	klog.V(4).Infof("node(%s) labels: kataVMIsolationLabel(%s), kataRuntimeLabel(%s)", nodeID, kataVMIsolationLabel, kataRuntimeLabel)
 
-	return strings.EqualFold(kataVMIsolationLabel, "true") || strings.EqualFold(kataRuntimeLabel, "true")
+	return strings.EqualFold(kataCCIsolationLabel, "true") || strings.EqualFold(kataVMIsolationLabel, "true") || strings.EqualFold(kataRuntimeLabel, "true")
 }

pkg/azurefile/azurefile_test.go

@@ -1640,7 +1640,7 @@ func TestGetNodeInfoFromLabels(t *testing.T) {
 		nodeName     string
 		labels       map[string]string
 		setupClient  bool
-		expectedVals [2]string
+		expectedVals [3]string
 		expectedErr  error
 	}{
 		{
@@ -1667,10 +1667,11 @@ func TestGetNodeInfoFromLabels(t *testing.T) {
 			nodeName:    "test-node",
 			setupClient: true,
 			labels: map[string]string{
+				"kubernetes.azure.com/kata-cc-isolation":      "true",
 				"kubernetes.azure.com/kata-mshv-vm-isolation": "true",
 				"katacontainers.io/kata-runtime":              "false",
 			},
-			expectedVals: [2]string{"true", "false"},
+			expectedVals: [3]string{"true", "true", "false"},
 			expectedErr:  nil,
 		},
 	}
@@ -1695,14 +1696,15 @@ func TestGetNodeInfoFromLabels(t *testing.T) {
 				assert.NoError(t, err)
 			}
 
-			kataVMIsolation, kataRuntime, err := getNodeInfoFromLabels(ctx, tc.nodeName, clientset)
+			kataCCIsolation, kataVMIsolation, kataRuntime, err := getNodeInfoFromLabels(ctx, tc.nodeName, clientset)
 
 			if tc.expectedErr != nil {
 				assert.EqualError(t, err, tc.expectedErr.Error())
 			} else {
 				assert.NoError(t, err)
-				assert.Equal(t, tc.expectedVals[0], kataVMIsolation)
-				assert.Equal(t, tc.expectedVals[1], kataRuntime)
+				assert.Equal(t, tc.expectedVals[0], kataCCIsolation)
+				assert.Equal(t, tc.expectedVals[1], kataVMIsolation)
+				assert.Equal(t, tc.expectedVals[2], kataRuntime)
 			}
 		})
 	}