Accepting request 1198400 from Virtualization

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

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.2.2</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.2.2
+          image: quay.io/kubevirt/disks-images-provider:v1.3.1
           imagePullPolicy: Always
+          env:
+          - name: NUM_TEST_IMAGE_REPLICAS
+            value: "6"
           lifecycle:
             preStop:
               exec:

kubevirt.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Tue Aug 27 06:36:20 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Build sidecar-shim package
+
+-------------------------------------------------------------------
+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>
+
+- Update to version 1.3.0
+  Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.3.0
+- Drop upstreamed patch
+  0001-Collect-component-Role-rules-under-operator-Role-ins.patch
+
+-------------------------------------------------------------------
+Fri Jul 19 07:30:33 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Add registry path for SLE15 SP7
+
+-------------------------------------------------------------------
+Thu Jun 20 13:48:18 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Collect component Role rules under operator Role instead of
+  ClusterRole (bsc#1223965, CVE-2024-33394)
+  0001-Collect-component-Role-rules-under-operator-Role-ins.patch
+
 -------------------------------------------------------------------
 Thu Jun  6 06:54:11 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 

kubevirt.spec

@@ -30,7 +30,7 @@
 %endif
 
 Name:           kubevirt
-Version:        1.2.2
+Version:        1.3.1
 Release:        0
 Summary:        Container native virtualization
 License:        Apache-2.0
@@ -41,12 +41,14 @@ 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
 BuildRequires:  rsync
 BuildRequires:  sed
-BuildRequires:  golang(API) >= 1.21
+BuildRequires:  golang(API) >= 1.22
 BuildRequires:  pkgconfig(libvirt)
 ExclusiveArch:  %{_exclusive_arch}
 
@@ -129,6 +131,14 @@ Group:          System/Packages
 The pr-helper-conf package provides configuration files for persistent
 reservation helper
 
+%package        sidecar-shim
+Summary:        Entrypoint for the sidecar-shim container
+Group:          System/Packages
+
+%description    sidecar-shim
+The package provides sidecar-shim binary than will call the respective
+hooks with the proper command-line arguments.
+
 %package        manifests
 Summary:        YAML manifests used to install kubevirt
 Group:          System/Packages
@@ -185,6 +195,11 @@ case "${distro}" in
     labelprefix=com.suse.kubevirt
     registry=registry.suse.com
     ;;
+150700:0)
+    tagprefix=suse/sles/15.7
+    labelprefix=com.suse.kubevirt
+    registry=registry.suse.com
+    ;;
 *:1)
     tagprefix=kubevirt
     labelprefix=org.opensuse.kubevirt
@@ -231,6 +246,7 @@ KUBEVIRT_GIT_VERSION='v%{version}' \
 KUBEVIRT_GIT_TREE_STATE="clean" \
 build_tests="true" \
 ./hack/build-go.sh install \
+    cmd/sidecars \
     cmd/virt-api \
     cmd/virt-chroot \
     cmd/virt-controller \
@@ -252,6 +268,7 @@ env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} KUBEVIRT_NO_BAZEL=t
 mkdir -p %{buildroot}%{_bindir}
 
 install -p -m 0755 _out/cmd/container-disk-v2alpha/container-disk %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/sidecars/sidecars %{buildroot}%{_bindir}/sidecar-shim
 install -p -m 0755 _out/cmd/virtctl/virtctl %{buildroot}%{_bindir}/
 install -p -m 0755 _out/cmd/virt-api/virt-api %{buildroot}%{_bindir}/
 install -p -m 0755 _out/cmd/virt-controller/virt-controller %{buildroot}%{_bindir}/
@@ -366,6 +383,11 @@ install -m 0644 %{S:2} %{buildroot}%{_prefix}/lib/obs/service
 %dir %{_datadir}/kube-virt/pr-helper
 %{_datadir}/kube-virt/pr-helper
 
+%files sidecar-shim
+%license LICENSE
+%doc cmd/sidecars/README.md
+%{_bindir}/sidecar-shim
+
 %files manifests
 %license LICENSE
 %doc README.md