pool/kubevirt
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 925072 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/925072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kubevirt?expand=0&rev=31
This commit is contained in:
Dominique Leuenberger 2021-10-13 16:06:25 +00:00 committed by Git OBS Bridge
commit d9348441cf
6 changed files with 12 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
0001-Specify-format-of-the-backing-image.patch
View File

@ -1,252 +0,0 @@
From 9619e0e977af51bf01917dc0f482c06daa32f089 Mon Sep 17 00:00:00 2001
From: Vasiliy Ulyanov <vulyanov@suse.de>
Date: Fri, 27 Aug 2021 13:38:24 +0200
Subject: [PATCH] Specify format of the backing image
Latest qemu-img deprecates use of -b without -F.
Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
---
pkg/container-disk/validation.go | 13 ++---
pkg/ephemeral-disk/ephemeral-disk.go | 50 +++++++++++++++----
pkg/virt-handler/isolation/BUILD.bazel | 2 +-
pkg/virt-handler/isolation/validation.go | 6 +--
.../virtwrap/converter/converter.go | 23 +--------
pkg/virt-launcher/virtwrap/manager.go | 4 +-
6 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/pkg/container-disk/validation.go b/pkg/container-disk/validation.go
index fcc4fa023..4160d4f15 100644
--- a/pkg/container-disk/validation.go
+++ b/pkg/container-disk/validation.go
@@ -2,20 +2,15 @@ package containerdisk
import (
"fmt"
+
+ ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
)
const (
DiskSourceFallbackPath = "/disk"
)
-type DiskInfo struct {
- Format string `json:"format"`
- BackingFile string `json:"backing-filename"`
- ActualSize int `json:"actual-size"`
- VirtualSize int `json:"virtual-size"`
-}
-
-func VerifyQCOW2(diskInfo *DiskInfo) error {
+func VerifyQCOW2(diskInfo *ephemeraldisk.DiskInfo) error {
if diskInfo.Format != "qcow2" {
return fmt.Errorf("expected a disk format of qcow2, but got '%v'", diskInfo.Format)
}
@@ -26,7 +21,7 @@ func VerifyQCOW2(diskInfo *DiskInfo) error {
return nil
}
-func VerifyImage(diskInfo *DiskInfo) error {
+func VerifyImage(diskInfo *ephemeraldisk.DiskInfo) error {
switch diskInfo.Format {
case "qcow2":
return VerifyQCOW2(diskInfo)
diff --git a/pkg/ephemeral-disk/ephemeral-disk.go b/pkg/ephemeral-disk/ephemeral-disk.go
index c88c21f64..fb0a51b32 100644
--- a/pkg/ephemeral-disk/ephemeral-disk.go
+++ b/pkg/ephemeral-disk/ephemeral-disk.go
@@ -20,6 +20,7 @@
package ephemeraldisk
import (
+ "encoding/json"
"fmt"
"os"
"os/exec"
@@ -34,6 +35,13 @@ const (
ephemeralDiskPVCBaseDir = "/var/run/kubevirt-private/vmi-disks"
)
+type DiskInfo struct {
+ Format string `json:"format"`
+ BackingFile string `json:"backing-filename"`
+ ActualSize int `json:"actual-size"`
+ VirtualSize int `json:"virtual-size"`
+}
+
type EphemeralDiskCreatorInterface interface {
CreateBackedImageForVolume(volume v1.Volume, backingFile string) error
CreateEphemeralImages(vmi *v1.VirtualMachineInstance) error
@@ -130,14 +138,36 @@ func (c *ephemeralDiskCreator) CreateEphemeralImages(vmi *v1.VirtualMachineInsta
}
func createBackingDisk(backingFile string, imagePath string) ([]byte, error) {
- // #nosec No risk for attacket injection. Parameters are predefined strings
- cmd := exec.Command("qemu-img",
- "create",
- "-f",
- "qcow2",
- "-b",
- backingFile,
- imagePath,
- )
- return cmd.CombinedOutput()
+ if backingInfo, err := GetImageInfo(backingFile); err != nil {
+ return nil, err
+ } else {
+ // #nosec No risk for attacker injection. Parameters are predefined strings
+ cmd := exec.Command("qemu-img",
+ "create",
+ "-f",
+ "qcow2",
+ "-b",
+ backingFile,
+ "-F",
+ backingInfo.Format,
+ imagePath,
+ )
+ return cmd.CombinedOutput()
+ }
+}
+
+func GetImageInfo(imagePath string) (*DiskInfo, error) {
+ // #nosec No risk for attacker injection. Only get information about an image
+ out, err := exec.Command(
+ "/usr/bin/qemu-img", "info", imagePath, "--output", "json",
+ ).Output()
+ if err != nil {
+ return nil, fmt.Errorf("failed to invoke qemu-img: %v", err)
+ }
+ info := &DiskInfo{}
+ err = json.Unmarshal(out, info)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse disk info: %v", err)
+ }
+ return info, err
}
diff --git a/pkg/virt-handler/isolation/BUILD.bazel b/pkg/virt-handler/isolation/BUILD.bazel
index 7284151d8..5c38b92d2 100644
--- a/pkg/virt-handler/isolation/BUILD.bazel
+++ b/pkg/virt-handler/isolation/BUILD.bazel
@@ -13,7 +13,7 @@ go_library(
importpath = "kubevirt.io/kubevirt/pkg/virt-handler/isolation",
visibility = ["//visibility:public"],
deps = [
- "//pkg/container-disk:go_default_library",
+ "//pkg/ephemeral-disk:go_default_library",
"//pkg/util:go_default_library",
"//pkg/virt-handler/cgroup:go_default_library",
"//pkg/virt-handler/cmd-client:go_default_library",
diff --git a/pkg/virt-handler/isolation/validation.go b/pkg/virt-handler/isolation/validation.go
index a5d507ddd..9c09405a6 100644
--- a/pkg/virt-handler/isolation/validation.go
+++ b/pkg/virt-handler/isolation/validation.go
@@ -8,14 +8,14 @@ import (
v1 "kubevirt.io/client-go/api/v1"
virt_chroot "kubevirt.io/kubevirt/pkg/virt-handler/virt-chroot"
- containerdisk "kubevirt.io/kubevirt/pkg/container-disk"
+ ephemeraldisk "kubevirt.io/kubevirt/pkg/ephemeral-disk"
)
const (
QEMUIMGPath = "/usr/bin/qemu-img"
)
-func GetImageInfo(imagePath string, context IsolationResult, config *v1.DiskVerification) (*containerdisk.DiskInfo, error) {
+func GetImageInfo(imagePath string, context IsolationResult, config *v1.DiskVerification) (*ephemeraldisk.DiskInfo, error) {
memoryLimit := fmt.Sprintf("%d", config.MemoryLimit.Value())
// #nosec g204 no risk to use MountNamespace() argument as it returns a fixed string of "/proc/<pid>/ns/mnt"
@@ -32,7 +32,7 @@ func GetImageInfo(imagePath string, context IsolationResult, config *v1.DiskVeri
return nil, fmt.Errorf("failed to invoke qemu-img: %v", err)
}
- info := &containerdisk.DiskInfo{}
+ info := &ephemeraldisk.DiskInfo{}
err = json.Unmarshal(out, info)
if err != nil {
return nil, fmt.Errorf("failed to parse disk info: %v", err)
diff --git a/pkg/virt-launcher/virtwrap/converter/converter.go b/pkg/virt-launcher/virtwrap/converter/converter.go
index ac1ba5a10..eeb0b2eb4 100644
--- a/pkg/virt-launcher/virtwrap/converter/converter.go
+++ b/pkg/virt-launcher/virtwrap/converter/converter.go
@@ -26,10 +26,8 @@ package converter
*/
import (
- "encoding/json"
"fmt"
"os"
- "os/exec"
"path/filepath"
"strconv"
"strings"
@@ -103,7 +101,7 @@ type ConverterContext struct {
IsBlockDV map[string]bool
HotplugVolumes map[string]v1.VolumeStatus
PermanentVolumes map[string]v1.VolumeStatus
- DiskType map[string]*containerdisk.DiskInfo
+ DiskType map[string]*ephemeraldisk.DiskInfo
SMBios *cmdv1.SMBios
SRIOVDevices []api.HostDevice
LegacyHostDevices []api.HostDevice
@@ -407,7 +405,7 @@ func SetDriverCacheMode(disk *api.Disk, directIOChecker DirectIOChecker) error {
}
func isPreAllocated(path string) bool {
- diskInf, err := GetImageInfo(path)
+ diskInf, err := ephemeraldisk.GetImageInfo(path)
if err != nil {
return false
}
@@ -1873,23 +1871,6 @@ func boolToString(value *bool, defaultPositive bool, positive string, negative s
return toString(*value)
}
-func GetImageInfo(imagePath string) (*containerdisk.DiskInfo, error) {
-
- // #nosec No risk for attacket injection. Only get information about an image
- out, err := exec.Command(
- "/usr/bin/qemu-img", "info", imagePath, "--output", "json",
- ).Output()
- if err != nil {
- return nil, fmt.Errorf("failed to invoke qemu-img: %v", err)
- }
- info := &containerdisk.DiskInfo{}
- err = json.Unmarshal(out, info)
- if err != nil {
- return nil, fmt.Errorf("failed to parse disk info: %v", err)
- }
- return info, err
-}
-
func needsSCSIControler(vmi *v1.VirtualMachineInstance) bool {
for _, disk := range vmi.Spec.Domain.Devices.Disks {
if disk.LUN != nil && disk.LUN.Bus == "scsi" {
diff --git a/pkg/virt-launcher/virtwrap/manager.go b/pkg/virt-launcher/virtwrap/manager.go
index e559b7292..615c53473 100644
--- a/pkg/virt-launcher/virtwrap/manager.go
+++ b/pkg/virt-launcher/virtwrap/manager.go
@@ -640,7 +640,7 @@ func (l *LibvirtDomainManager) generateConverterContext(vmi *v1.VirtualMachineIn
// Check if PVC volumes are block volumes
isBlockPVCMap := make(map[string]bool)
isBlockDVMap := make(map[string]bool)
- diskInfo := make(map[string]*containerdisk.DiskInfo)
+ diskInfo := make(map[string]*ephemeraldisk.DiskInfo)
for i, volume := range vmi.Spec.Volumes {
if volume.VolumeSource.PersistentVolumeClaim != nil {
isBlockPVC := false
@@ -655,7 +655,7 @@ func (l *LibvirtDomainManager) generateConverterContext(vmi *v1.VirtualMachineIn
if err != nil {
return nil, err
}
- info, err := converter.GetImageInfo(image)
+ info, err := ephemeraldisk.GetImageInfo(image)
if err != nil {
return nil, err
}
--
2.33.0

2
_service
View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">kubevirt</param>
<param name="revision">v0.45.0</param>
<param name="revision">v0.46.0</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://github.com/kubevirt/kubevirt</param>

3
kubevirt-0.45.0.tar.gz
View File

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

3
kubevirt-0.46.0.tar.gz Normal file
View File

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

7
kubevirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 11 15:02:22 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>
- Update to version 0.46.0
Release notes https://github.com/kubevirt/kubevirt/releases/tag/v0.46.0
- Drop upstreamed patch 0001-Specify-format-of-the-backing-image.patch
-------------------------------------------------------------------
Thu Sep 9 05:01:33 UTC 2021 - Vasily Ulyanov <vasily.ulyanov@suse.com>

3
kubevirt.spec
View File

@ -17,7 +17,7 @@
Name: kubevirt
Version: 0.45.0
Version: 0.46.0
Release: 0
Summary: Container native virtualization
License: Apache-2.0
@ -28,7 +28,6 @@ Source1: kubevirt-psp-caasp.yaml
Source2: kubevirt_containers_meta
Source3: kubevirt_containers_meta.service
Source100: %{name}-rpmlintrc
Patch0: 0001-Specify-format-of-the-backing-image.patch
BuildRequires: glibc-devel-static
BuildRequires: golang-packaging
BuildRequires: pkgconfig