File 0005-Use-compat-cmdline-options-for-virtiofsd.patch of Package kubevirt.34890
From b2b0dfc8220b252f4696c005a11cff8f65c16720 Mon Sep 17 00:00:00 2001
From: Vasiliy Ulyanov <vulyanov@suse.de>
Date: Tue, 25 Jul 2023 08:39:28 +0200
Subject: [PATCH] Use compat cmdline options for virtiofsd
Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
---
pkg/virt-controller/services/virtiofs.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkg/virt-controller/services/virtiofs.go b/pkg/virt-controller/services/virtiofs.go
index d1578875e..049ebd4e3 100644
--- a/pkg/virt-controller/services/virtiofs.go
+++ b/pkg/virt-controller/services/virtiofs.go
@@ -156,19 +156,19 @@ func virtioFSMountPoint(volume *v1.Volume) string {
func generateContainerFromVolume(config *virtconfig.ClusterConfig, volume *v1.Volume, image string, resources k8sv1.ResourceRequirements) k8sv1.Container {
socketPathArg := fmt.Sprintf("--socket-path=%s", virtiofs.VirtioFSSocketPath(volume.Name))
- sourceArg := fmt.Sprintf("--shared-dir=%s", virtioFSMountPoint(volume))
- args := []string{socketPathArg, sourceArg, "--cache=auto"}
+ sourceArg := fmt.Sprintf("source=%s", virtioFSMountPoint(volume))
+ args := []string{socketPathArg, "-o", sourceArg, "-o", "cache=auto"}
securityProfile := restricted
sandbox := "none"
if virtiofs.CanRunWithPrivileges(config, volume) {
securityProfile = privileged
sandbox = "chroot"
- args = append(args, "--xattr")
+ args = append(args, "-o", "xattr", "-o", "xattrmap=:map::user.virtiofsd.:")
}
- sandboxArg := fmt.Sprintf("--sandbox=%s", sandbox)
- args = append(args, sandboxArg)
+ sandboxArg := fmt.Sprintf("sandbox=%s", sandbox)
+ args = append(args, "-o", sandboxArg)
volumeMounts := []k8sv1.VolumeMount{
// This is required to pass socket to compute
--
2.45.2
