Accepting request 1137022 from Virtualization

baserev update by copy to link target

OBS-URL: https://build.opensuse.org/request/show/1137022
OBS-URL: https://build.opensuse.org/package/show/Virtualization/kubevirt?expand=0&rev=146

0002-virt-launcher-fix-qemu-non-root-path.patch

@@ -0,0 +1,29 @@
+From 962ce51df790f9a42885db3de5e34bef99d595de Mon Sep 17 00:00:00 2001
+From: Enrique Llorente <ellorent@redhat.com>
+Date: Wed, 8 Nov 2023 14:05:43 +0100
+Subject: [PATCH] virt-launcher: fix qemu non root path
+
+The qemu log path is now under /var/run/kubevirt-private/libvirt/qemu instead of
+/var/run/libvirt/qemu. This change adapt the virt-launcher code to that
+
+Signed-off-by: Enrique Llorente <ellorent@redhat.com>
+---
+ pkg/virt-launcher/virtwrap/util/libvirt_helper.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go
+index 8dd514f11..b342c034f 100644
+--- a/pkg/virt-launcher/virtwrap/util/libvirt_helper.go
++++ b/pkg/virt-launcher/virtwrap/util/libvirt_helper.go
+@@ -286,7 +286,7 @@ func startVirtlogdLogging(stopChan chan struct{}, domainName string, nonRoot boo
+ 		go func() {
+ 			logfile := fmt.Sprintf("/var/log/libvirt/qemu/%s.log", domainName)
+ 			if nonRoot {
+-				logfile = filepath.Join("/var", "run", "libvirt", "qemu", "log", fmt.Sprintf("%s.log", domainName))
++				logfile = filepath.Join("/var", "run", "kubevirt-private", "libvirt", "qemu", "log", fmt.Sprintf("%s.log", domainName))
+ 			}
+ 
+ 			// It can take a few seconds to the log file to be created
+-- 
+2.42.1
+

0004-seccomp-Use-Names-field-to-define-the-syscall.patch

@@ -0,0 +1,27 @@
+From 0564fc86b7387d2c3b9f16a5f712ed3282c894e5 Mon Sep 17 00:00:00 2001
+From: Vasiliy Ulyanov <vulyanov@suse.de>
+Date: Fri, 15 Dec 2023 13:22:10 +0100
+Subject: [PATCH] seccomp: Use 'Names' field to define the syscall
+
+Apparently, 'Name' has been deprecated in favour of 'Names'. Some
+container runtimes do not handle 'Name' and thus fail to correctly set
+the profile for seccomp.
+
+Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
+---
+ pkg/virt-handler/seccomp/seccomp.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/virt-handler/seccomp/seccomp.go b/pkg/virt-handler/seccomp/seccomp.go
+index abc20b24af9e..f2ff71ac0bcc 100644
+--- a/pkg/virt-handler/seccomp/seccomp.go
++++ b/pkg/virt-handler/seccomp/seccomp.go
+@@ -70,7 +70,7 @@ func defaultProfile() *seccomp.Seccomp {
+ 	}
+ 
+ 	profile.Syscalls = append(profile.Syscalls, &seccomp.Syscall{
+-		Name:   "userfaultfd",
++		Names:  []string{"userfaultfd"},
+ 		Action: seccomp.ActAllow,
+ 		Args:   []*seccomp.Arg{},
+ 	})

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="manual">
     <param name="filename">kubevirt</param>
-    <param name="revision">v1.1.1</param>
+    <param name="revision">v1.1.0</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/kubevirt/kubevirt</param>

disks-images-provider.yaml

@@ -22,7 +22,7 @@ spec:
       serviceAccountName: kubevirt-testing
       containers:
         - name: target
-          image: quay.io/kubevirt/disks-images-provider:v1.1.1
+          image: quay.io/kubevirt/disks-images-provider:v1.1.0
           imagePullPolicy: Always
           lifecycle:
             preStop:

kubevirt-1.1.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a483208a3c5922fbcbc505d07d2f47b703f3e47a17f534a5e0b611d27f60a2c
+size 16230961

kubevirt.changes

@@ -1,14 +1,3 @@
--------------------------------------------------------------------
-Thu Jan  4 06:47:58 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
-
-- Update to version 1.1.1
-  Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.1.1
-- Drop upstreamed patches
-  0001-Update-google.golang.org-grpc-to-1.56.3.patch
-  0002-virt-launcher-fix-qemu-non-root-path.patch
-  0003-cgroupsv2-reconstruct-device-allowlist.patch
-  0004-seccomp-Use-Names-field-to-define-the-syscall.patch
-
 -------------------------------------------------------------------
 Wed Jan  3 09:53:18 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 

kubevirt.spec

@@ -30,7 +30,7 @@
 %endif
 
 Name:           kubevirt
-Version:        1.1.1
+Version:        1.1.0
 Release:        0
 Summary:        Container native virtualization
 License:        Apache-2.0
@@ -41,6 +41,10 @@ Source1:        kubevirt_containers_meta
 Source2:        kubevirt_containers_meta.service
 Source3:        %{url}/releases/download/v%{version}/disks-images-provider.yaml
 Source100:      %{name}-rpmlintrc
+Patch1:         0001-Update-google.golang.org-grpc-to-1.56.3.patch
+Patch2:         0002-virt-launcher-fix-qemu-non-root-path.patch
+Patch3:         0003-cgroupsv2-reconstruct-device-allowlist.patch
+Patch4:         0004-seccomp-Use-Names-field-to-define-the-syscall.patch
 BuildRequires:  glibc-devel-static
 BuildRequires:  golang-packaging
 BuildRequires:  pkgconfig