Skip to content

Commit c6065e3

Browse files
arc9693k8s-infra-cherrypick-robot
authored andcommitted
azurefile: revert to use virtio-fs for kata pods
This patch reverts a change made in commit 1bae6a7 which added support for using cifs mount in kata pods (lightweight VMs). The change was made to address disablement of virtio-fs in kata pods wrt kata GA. However, it has been found that virtio-fs will be kept functional in kata pods. Signed-off-by: Archana Choudhary <[email protected]>
1 parent e28f5ce commit c6065e3

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

pkg/azurefile/azurefile.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1365,5 +1365,5 @@ func isKataNode(ctx context.Context, nodeID string, kubeClient clientset.Interfa
13651365
return false
13661366
}
13671367
klog.V(4).Infof("node(%s) labels: kataVMIsolationLabel(%s), kataRuntimeLabel(%s)", nodeID, kataVMIsolationLabel, kataRuntimeLabel)
1368-
return strings.EqualFold(kataCCIsolationLabel, "true") || strings.EqualFold(kataVMIsolationLabel, "true") || strings.EqualFold(kataRuntimeLabel, "true")
1368+
return strings.EqualFold(kataCCIsolationLabel, "true")
13691369
}

pkg/azurefile/azurefile_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,7 +1739,7 @@ func TestIsKataNode(t *testing.T) {
17391739
nodeName: "test-node",
17401740
setupClient: true,
17411741
labels: map[string]string{
1742-
"kubernetes.azure.com/kata-mshv-vm-isolation": "true",
1742+
"kubernetes.azure.com/kata-cc-isolation": "true",
17431743
},
17441744
expected: true,
17451745
},

pkg/azurefile/utils.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ func isReadOnlyFromCapability(vc *csi.VolumeCapability) bool {
318318
}
319319

320320
const confidentialRuntimeClassHandler = "kata-cc"
321-
const kataVMIsolationRuntimeClassHandler = "kata"
322321

323322
// check if runtimeClass is confidential
324323
func isConfidentialRuntimeClass(ctx context.Context, kubeClient clientset.Interface, runtimeClassName string) (bool, error) {
@@ -335,8 +334,7 @@ func isConfidentialRuntimeClass(ctx context.Context, kubeClient clientset.Interf
335334
return false, err
336335
}
337336
klog.V(4).Infof("runtimeClass %s handler: %s", runtimeClassName, runtimeClass.Handler)
338-
return runtimeClass.Handler == confidentialRuntimeClassHandler ||
339-
runtimeClass.Handler == kataVMIsolationRuntimeClassHandler, nil
337+
return runtimeClass.Handler == confidentialRuntimeClassHandler, nil
340338
}
341339

342340
// getBackOff returns a backoff object based on the config

0 commit comments

Comments
 (0)