Accepting request 1196308 from Virtualization

OBS-URL: https://build.opensuse.org/request/show/1196308
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kubevirt?expand=0&rev=78

0001-Consider-the-new-DV-reason-ImagePullFailed.patch

@@ -0,0 +1,30 @@
+From 0e1608be9df30a3765d3c17ca01d7c5bfa542edd Mon Sep 17 00:00:00 2001
+From: Vasiliy Ulyanov <vulyanov@suse.de>
+Date: Thu, 22 Aug 2024 09:27:33 +0200
+Subject: [PATCH] Consider the new DV reason ImagePullFailed
+
+CDI v1.60.1 introduces a new reason ImagePullFailed for the DataVolume
+Running condition. Take it into account to properly update the printable
+status of a VM and to report the error.
+
+Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
+---
+ pkg/storage/types/dv.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkg/storage/types/dv.go b/pkg/storage/types/dv.go
+index d90011815..a96984dc4 100644
+--- a/pkg/storage/types/dv.go
++++ b/pkg/storage/types/dv.go
+@@ -184,7 +184,7 @@ func HasDataVolumeErrors(namespace string, volumes []virtv1.Volume, dataVolumeSt
+ 		dvRunningCond := NewDataVolumeConditionManager().GetCondition(dv, cdiv1.DataVolumeRunning)
+ 		if dvRunningCond != nil &&
+ 			dvRunningCond.Status == v1.ConditionFalse &&
+-			dvRunningCond.Reason == "Error" {
++			(dvRunningCond.Reason == "Error" || dvRunningCond.Reason == "ImagePullFailed") {
+ 			return fmt.Errorf("DataVolume %s importer has stopped running due to an error: %v",
+ 				volume.DataVolume.Name, dvRunningCond.Message)
+ 		}
+-- 
+2.46.0
+

0002-tests-Set-FSGroup-to-ensure-proper-permissions.patch

@@ -0,0 +1,44 @@
+From 96bd87f47a1f0ba7c0079e8665f94d7cd38f3038 Mon Sep 17 00:00:00 2001
+From: Vasiliy Ulyanov <vulyanov@suse.de>
+Date: Mon, 26 Aug 2024 08:18:52 +0200
+Subject: [PATCH] tests: Set FSGroup to ensure proper permissions
+
+This fixes 'Permission Denied' error with some storage providers.
+
+Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
+---
+ tests/storage/migration.go | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/tests/storage/migration.go b/tests/storage/migration.go
+index c6911848b..bb17cfdde 100644
+--- a/tests/storage/migration.go
++++ b/tests/storage/migration.go
+@@ -459,16 +459,20 @@ func createSmallImageForDestinationMigration(vm *virtv1.VirtualMachine, name, si
+ 			},
+ 		},
+ 	}
++	podSecurityContext := k8sv1.PodSecurityContext{
++		FSGroup: pointer.P(int64(util.NonRootUID)),
++	}
+ 	pod := k8sv1.Pod{
+ 		ObjectMeta: metav1.ObjectMeta{
+ 			GenerateName: "create-img-",
+ 			Namespace:    vmi.Namespace,
+ 		},
+ 		Spec: k8sv1.PodSpec{
+-			RestartPolicy: k8sv1.RestartPolicyNever,
+-			Volumes:       []k8sv1.Volume{volume},
+-			Containers:    []k8sv1.Container{cont},
+-			Affinity:      &affinity,
++			RestartPolicy:   k8sv1.RestartPolicyNever,
++			Volumes:         []k8sv1.Volume{volume},
++			Containers:      []k8sv1.Container{cont},
++			Affinity:        &affinity,
++			SecurityContext: &podSecurityContext,
+ 		},
+ 	}
+ 	p, err := virtCli.CoreV1().Pods(vmi.Namespace).Create(context.Background(), &pod, metav1.CreateOptions{})
+-- 
+2.46.0
+

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="manual">
     <param name="filename">kubevirt</param>
-    <param name="revision">v1.3.0</param>
+    <param name="revision">v1.3.1</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,8 +22,11 @@ spec:
       serviceAccountName: kubevirt-testing
       containers:
         - name: target
-          image: quay.io/kubevirt/disks-images-provider:v1.3.0
+          image: quay.io/kubevirt/disks-images-provider:v1.3.1
           imagePullPolicy: Always
+          env:
+          - name: NUM_TEST_IMAGE_REPLICAS
+            value: "6"
           lifecycle:
             preStop:
               exec:

kubevirt-1.3.0.tar.gz

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

kubevirt.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Aug 26 08:27:16 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Update to version 1.3.1
+  Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.3.1
+- Fix DV error report via VM printable status
+  0001-Consider-the-new-DV-reason-ImagePullFailed.patch
+- Fix permission error in storage migration tests
+  0002-tests-Set-FSGroup-to-ensure-proper-permissions.patch
+
 -------------------------------------------------------------------
 Fri Jul 19 07:32:30 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 

kubevirt.spec

@@ -30,7 +30,7 @@
 %endif
 
 Name:           kubevirt
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 Summary:        Container native virtualization
 License:        Apache-2.0
@@ -41,6 +41,8 @@ Source1:        kubevirt_containers_meta
 Source2:        kubevirt_containers_meta.service
 Source3:        %{url}/releases/download/v%{version}/disks-images-provider.yaml
 Source100:      %{name}-rpmlintrc
+Patch1:         0001-Consider-the-new-DV-reason-ImagePullFailed.patch
+Patch2:         0002-tests-Set-FSGroup-to-ensure-proper-permissions.patch
 BuildRequires:  glibc-devel-static
 BuildRequires:  golang-packaging
 BuildRequires:  pkgconfig