ALP-pool/kubevirt
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync from SUSE:ALP:Source:Standard:1.0 kubevirt revision 04ebfc1412869ebc5820489151e0b92e

Browse Source
This commit is contained in:
Adrian Schröter 2024-09-18 15:26:15 +02:00
parent 762ce1bb2e
commit bf51fce02b
9 changed files with 137 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Consider-the-new-DV-reason-ImagePullFailed.patch Normal file
View File

@ -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

29
0001-tests-Adapt-VM-phase-expectation.patch
View File

@ -1,29 +0,0 @@
From aa6647c263408bdf0518d74da2d4c37d3bb42de0 Mon Sep 17 00:00:00 2001
From: Vasiliy Ulyanov <vulyanov@suse.de>
Date: Wed, 13 Dec 2023 08:10:37 +0100
Subject: [PATCH] tests: Adapt VM phase expectation
When CDI uses volume populators with malformed DataVolume, the VM
initially transitions to Scheduling phase.
Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
---
tests/storage/datavolume.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/storage/datavolume.go b/tests/storage/datavolume.go
index 46677257d..9d86d0eac 100644
--- a/tests/storage/datavolume.go
+++ b/tests/storage/datavolume.go
@@ -536,7 +536,7 @@ var _ = SIGDescribe("DataVolume Integration", func() {
vm, err = virtClient.VirtualMachine(vm.Namespace).Create(context.Background(), vm)
Expect(err).ToNot(HaveOccurred())
- Eventually(ThisVMIWith(vm.Namespace, vm.Name), 100).Should(BeInPhase(v1.Pending))
+ Eventually(ThisVMIWith(vm.Namespace, vm.Name), 100).Should(Or(BeInPhase(v1.Pending), BeInPhase(v1.Scheduling)))
By("Creating a service which makes the registry reachable")
_, err = virtClient.CoreV1().Services(vm.Namespace).Create(context.Background(), &k8sv1.Service{
--
2.43.0

44
0002-tests-Set-FSGroup-to-ensure-proper-permissions.patch Normal file
View File

@ -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

2
_service
View File

@ -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.3.1</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/kubevirt/kubevirt</param>

5
disks-images-provider.yaml
View File

@ -22,8 +22,11 @@ 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.3.1
imagePullPolicy: Always
env:
- name: NUM_TEST_IMAGE_REPLICAS
value: "6"
lifecycle:
preStop:
exec:

BIN
kubevirt-1.1.1.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

BIN
kubevirt-1.3.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

35
kubevirt.changes
View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Fri Sep 6 05:49:19 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
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
- 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
- Add registry path for SLE15 SP7
- Bump to the latest tag 1.3.1-150600.5.9.1
-------------------------------------------------------------------
Wed Jul 31 07:57:34 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Use the images based on SLE15 SP6 BCI
- Bump to the latest tag 1.2.2-150600.5.6.1
bsc#1221538; bsc#1220512; bsc#1223965
-------------------------------------------------------------------
Mon Jul 8 07:13:03 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Update to version 1.2.2
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.2.2
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.2.1
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v1.2.0
- Drop patches
0001-tests-Adapt-VM-phase-expectation.patch
- Add patch
0001-Collect-component-Role-rules-under-operator-Role-ins.patch
- Pack configuration files for libvirt
-------------------------------------------------------------------
Mon Feb 12 08:48:49 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>

26
kubevirt.spec
View File

@ -30,7 +30,7 @@
%endif
Name: kubevirt
Version: 1.1.1
Version: 1.3.1
Release: 0
Summary: Container native virtualization
License: Apache-2.0
@ -41,13 +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-tests-Adapt-VM-phase-expectation.patch
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.19
BuildRequires: golang(API) >= 1.22
BuildRequires: pkgconfig(libvirt)
ExclusiveArch: %{_exclusive_arch}
@ -186,6 +187,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
@ -247,10 +253,10 @@ build_tests="true" \
cmd/virtctl \
%{nil}
# Note: the generated manifests will point to the images based on SLE15 SP5 BCI.
# Note: the generated manifests will point to the images based on SLE15 SP6 BCI.
env \
DOCKER_PREFIX=registry.suse.com/suse/sles/15.5 \
DOCKER_TAG=1.1.1-150500.8.9.1 \
DOCKER_PREFIX=registry.suse.com/suse/sles/15.6 \
DOCKER_TAG=1.3.1-150600.5.9.1 \
KUBEVIRT_NO_BAZEL=true \
./hack/build-manifests.sh
@ -285,6 +291,11 @@ install -p -m 0644 cmd/virt-handler/virt_launcher.cil %{buildroot}%{_datadir}/ku
mkdir -p %{buildroot}%{_datadir}/kube-virt/pr-helper
install -p -m 0644 cmd/pr-helper/multipath.conf %{buildroot}%{_datadir}/kube-virt/pr-helper/
# Configuration files for libvirt
mkdir -p %{buildroot}%{_datadir}/kube-virt/virt-launcher
install -p -m 0644 cmd/virt-launcher/virtqemud.conf %{buildroot}%{_datadir}/kube-virt/virt-launcher
install -p -m 0644 cmd/virt-launcher/qemu.conf %{buildroot}%{_datadir}/kube-virt/virt-launcher
# Install release manifests
mkdir -p %{buildroot}%{_datadir}/kube-virt/manifests/release
install -m 0644 _out/manifests/release/kubevirt-operator.yaml %{buildroot}%{_datadir}/kube-virt/manifests/release/
@ -345,12 +356,15 @@ install -m 0644 %{S:2} %{buildroot}%{_prefix}/lib/obs/service
%files virt-launcher
%license LICENSE
%doc README.md
%dir %{_datadir}/kube-virt
%dir %{_datadir}/kube-virt/virt-launcher
%{_bindir}/virt-launcher
%{_bindir}/virt-launcher-monitor
%{_bindir}/virt-freezer
%{_bindir}/virt-probe
%{_bindir}/virt-tail
%{_bindir}/node-labeller.sh
%{_datadir}/kube-virt/virt-launcher
%files virt-operator
%license LICENSE