8:55 a.m.
This is very bare-bones at the moment. It only has minimal
documentation and has no tests at all.
Nevertheless, this adds a new -o kubevirt mode, so you can import
guests into Kubevirt, a system which adds virtualization support to
Kubernetes[0]. Example of generated YAML metadata can be found at the
end of this cover email. Upstream examples of metadata to compare it
to can be found in [1].
I wasn't able to test this yet since my Kubernetes instance died and
no one knows how to fix it ...
I only bothered to map out the basic hardware and disks, there are
many to-dos which will require reading the Kubevirt source code to
finish.
Generating YAML is an adventure. The format is full of nasty
beartraps. What I'm doing is probably mostly safe, but I wouldn't be
surprised if there are security holes.
Rich.
---
# generated by virt-v2v 2.1.1local,libvirt
apiVersion: kubevirt.io/v1
kind: VirtualMachineInstance
metadata:
name: fedora-35
spec:
domain:
devices:
disks:
- disk:
bus: virtio
name: disk-0
resources:
requests:
memory: 2048Mi
cpu:
cores: 1
features:
acpi: {}
apic: {}
pae: {}
volumes:
- hostDisk:
path: /var/tmp//fedora-35-sda
type: Disk
name: disk-0
terminationGracePeriodSeconds: 0
[0] https://github.com/kubevirt/kubevirt
[1] https://github.com/kubevirt/kubevirt/tree/main/examples
8:55 a.m.
New subject: [PATCH v2v 1/2] lib: Add a simple YAML generator
This is only enough to be able to generate Kubevirt machine
descriptions so it does not have to deal with all the general
complexity of YAML. Only associative arrays, lists, simple types like
strings, and blocks of lines are supported.
Unfortunately even generating simple YAML safely is not easy. There
are many quirks to the format and many traps, including the dependency
between lists and associative arrays, and the lack of type safety.
---
lib/Makefile.am | 2 +
lib/YAML.ml | 187 ++++++++++++++++++++++++++++++++++++++++++++++++
lib/YAML.mli | 39 ++++++++++
3 files changed, 228 insertions(+)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1fab25b326..cddc3c7af5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -31,6 +31,7 @@ SOURCES_MLI = \
config.mli \
create_ovf.mli \
DOM.mli \
+ YAML.mli \
libvirt_utils.mli \
nbdkit.mli \
networks.mli \
@@ -45,6 +46,7 @@ SOURCES_ML = \
qemuNBD.ml \
networks.ml \
DOM.ml \
+ YAML.ml \
create_ovf.ml \
libvirt_utils.ml
diff --git a/lib/YAML.ml b/lib/YAML.ml
new file mode 100644
index 0000000000..fdd16083b3
--- /dev/null
+++ b/lib/YAML.ml
@@ -0,0 +1,187 @@
+(* virt-v2v
+ * Copyright (C) 2009-2022 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Std_utils
+open Tools_utils
+open Common_gettext.Gettext
+
+open Printf
+
+let spaces = String.spaces
+
+(* See YAML 1.2 section 2.4 "Tags". We're just trying to match things
+ * which might be misinterpreted so that we know when to quote strings.
+ * It doesn't matter if we match too eagerly here.
+ *)
+let re_reserved = PCRE.compile "^[\\[\\-\\]{}>|*&!%#'@,?:]"
+let re_numeric1 = PCRE.compile ~caseless:true "^[-+.0-9exo]+$"
+let re_numeric2 = PCRE.compile ~caseless:true "(inf|nan)$"
+let re_boolean = PCRE.compile ~caseless:true
"^(y|yes|n|no|true|false|on|off)$"
+
+type node =
+ | Assoc of (string * node) list
+ | List of node list
+ | String of string
+ | Int of int
+ | Bool of bool
+ | Float of float
+ | Block of string list
+type doc = Doc of node
+
+let rec doc_to_buf buf (Doc node) =
+ bprintf buf "---";
+ node_to_buf buf 0 node;
+ bprintf buf "\n"
+
+and node_to_buf buf indent = function
+ | Assoc xs -> assoc_to_buf buf indent xs
+ | List xs -> list_to_buf buf indent xs
+ | String str -> string_to_buf buf str
+ | Int i -> int_to_buf buf i
+ | Bool b -> bool_to_buf buf b
+ | Float f -> float_to_buf buf f
+ | Block lines -> block_to_buf buf indent lines
+
+and assoc_to_buf buf ?(nl = true) indent xs =
+ let nl = ref nl in
+ List.iter (
+ fun (key, value) ->
+ (* Print newline and indent, if nl is true. *)
+ if !nl then bprintf buf "\n%s" (spaces indent);
+ nl := true;
+
+ (* If the key is "#" then it is printed as a comment. *)
+ if key = "#" then (
+ match value with
+ | String comment -> bprintf buf "# %s" comment
+ | _ -> assert false
+ )
+ else (
+ bprintf buf "%s:" key;
+ (* Do we need a space after the key? This is basically
+ * about whether node_to_buf will print \n, which breaks
+ * encapsulation of this function. Make a best guess.
+ *)
+ (match value with
+ | String _ | Int _ | Bool _ | Float _ | Block _ | List [] ->
+ bprintf buf " "
+ | _ -> ()
+ );
+ (* Non-empty lists are not indented. *)
+ let indent =
+ match value with
+ | List (_::_) -> indent
+ | _ -> indent+2 in
+ node_to_buf buf indent value
+ )
+ ) xs
+
+and list_to_buf buf indent =
+ function
+ (* Special case empty list, I think is required. We could also special
+ * case other things, eg. lists of short, unquoted strings, but
+ * let's not overcomplicate things.
+ *)
+ | [] -> bprintf buf "{}"
+ | xs ->
+ List.iter (
+ fun node ->
+ bprintf buf "\n%s- " (spaces indent);
+ (* If it's an assoc list, then don't print first newline. *)
+ match node with
+ | Assoc xs -> assoc_to_buf buf ~nl:false (indent+2) xs
+ | _ -> node_to_buf buf (indent+2) node
+ ) xs
+
+(* Strings are always printed on the same line. *)
+and string_to_buf buf str =
+ if not (needs_quoting str) then bprintf buf "%s" str
+ else c_quoted_string_to_buf buf str
+
+and c_quoted_string_to_buf buf str =
+ bprintf buf "\"";
+ for i = 0 to String.length str - 1 do
+ let c = String.unsafe_get str i in
+ if c = '"' then bprintf buf "\\\""
+ else if c < ' ' then bprintf buf "\\x%02x" (Char.code c)
+ else bprintf buf "%c" c
+ done;
+ bprintf buf "\""
+
+(* It's extremely difficult to give a complete list of strings
+ * that have to be quoted, versus strings that can be safely
+ * used as barewords. For example strings like "Yes", "no",
+ * "true", "123", "123.0" cannot be written as barewords
since
+ * they will be misinterpreted as booleans, integers or floats.
+ * (These rules also depend on the version of YAML!)
+ *)
+and needs_quoting str =
+ String.length str = 0 ||
+ PCRE.matches re_reserved str ||
+ PCRE.matches re_numeric1 str ||
+ PCRE.matches re_numeric2 str ||
+ PCRE.matches re_boolean str ||
+ let n = String.length str in
+ let rec loop i =
+ if i >= n then false
+ else if String.unsafe_get str i <= ' ' then true
+ else loop (i+1)
+ in
+ loop 0
+
+and int_to_buf buf i = bprintf buf "%d" i
+
+and bool_to_buf buf b = bprintf buf "%b" b
+
+and float_to_buf buf f = bprintf buf "%f" f
+
+(* Blocks are printed using "|" + "\n" followed by the indented
lines
+ * of text. We implicitly assume that each line is followed by \n
+ * so we don't have to use a chomp mode, but this page is interesting
+ * in case we need to in future: https://yaml-multiline.info/
+ *)
+and block_to_buf buf indent lines =
+ (* If a line contains \n within the line then that indicates
+ * a bug in virt-v2v. Since this could be used to bypass
+ * indenting -- thus generating arbitrary YAML -- detect this
+ * situation and error out. As far as I'm aware, no other
+ * character in blocks needs to be handled specially.
+ *)
+ List.iter (
+ fun line ->
+ if String.contains line '\n' || String.contains line '\r' then
+ error (f_"YAML block contains newline character. \
+ This should not happen, please report a bug against \
+ virt-v2v.")
+ ) lines;
+
+ bprintf buf "|";
+ let indent = indent+2 in
+ List.iter (
+ fun line -> bprintf buf "\n%s%s" (spaces indent) line
+ ) lines
+
+let doc_to_string doc =
+ let buf = Buffer.create 4096 in
+ doc_to_buf buf doc;
+ Buffer.contents buf
+
+let doc_to_chan chan doc =
+ let buf = Buffer.create 4096 in
+ doc_to_buf buf doc;
+ Buffer.output_buffer chan buf
diff --git a/lib/YAML.mli b/lib/YAML.mli
new file mode 100644
index 0000000000..6728a2fd5f
--- /dev/null
+++ b/lib/YAML.mli
@@ -0,0 +1,39 @@
+(* virt-v2v
+ * Copyright (C) 2009-2022 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(** Simple YAML generator.
+
+ This doesn't attempt to model all of YAML, only enough
+ to be able to generate Kubevirt machine descriptions.
+*)
+
+type node =
+ | Assoc of (string * node) list (* dictionary of key: value *)
+ | List of node list (* list of - nodes *)
+ | String of string (* simple string *)
+ | Int of int (* integer *)
+ | Bool of bool (* bool - NB. "Norway problem" *)
+ | Float of float (* float *)
+ | Block of string list (* block of lines *)
+type doc = Doc of node
+
+val doc_to_string : doc -> string
+(** Convert a document to a string representation. *)
+
+val doc_to_chan : out_channel -> doc -> unit
+(** Write the YAML document to an output channel. *)
--
2.35.1
8:55 a.m.
New subject: [PATCH v2v 2/2] output: Add new -o kubevirt mode
This commit adds a new -o kubevirt mode. You can specify where to
place the disks and metadata (guest.yaml) file using -os. Also
allocation mode (-oa) and disk format (-of) may be set. For example:
$ virt-v2v -i disk guest.img -o kubevirt -os /var/tmp
will generate /var/tmp/guest.yaml and /var/tmp/guest-sda
This is not finalized since undoubtedly the way the disks are handled
will have to be changed in future.
---
docs/virt-v2v.pod | 18 +++++
output/Makefile.am | 4 +
output/create_kubevirt_yaml.ml | 128 ++++++++++++++++++++++++++++++++
output/create_kubevirt_yaml.mli | 27 +++++++
output/output_kubevirt.ml | 96 ++++++++++++++++++++++++
output/output_kubevirt.mli | 21 ++++++
v2v/v2v.ml | 5 +-
7 files changed, 298 insertions(+), 1 deletion(-)
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index d627734b0d..7041a0d69d 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -429,6 +429,24 @@ instead.
Set the output method to OpenStack Glance. In this mode the converted
guest is uploaded to Glance. See L<virt-v2v-output-openstack(1)>.
+=item B<-o> B<kubevirt>
+
+Set the output method to I<kubevirt>.
+
+In this mode, the converted guest is written to a local directory
+specified by I<-os /dir> (the directory must exist). The converted
+guest’s disks are written to:
+
+ /dir/name-sda
+ /dir/name-sdb
+ [etc]
+
+and guest metadata is created in the associated YAML file:
+
+ /dir/name.yaml
+
+where C<name> is the guest name.
+
=item B<-o> B<libvirt>
Set the output method to I<libvirt>. This is the default.
diff --git a/output/Makefile.am b/output/Makefile.am
index dd488549db..7a13a99217 100644
--- a/output/Makefile.am
+++ b/output/Makefile.am
@@ -44,10 +44,12 @@ EXTRA_DIST = \
SOURCES_MLI = \
changeuid.mli \
create_libvirt_xml.mli \
+ create_kubevirt_yaml.mli \
openstack_image_properties.mli \
output.mli \
output_disk.mli \
output_glance.mli \
+ output_kubevirt.mli \
output_libvirt.mli \
output_null.mli \
output_openstack.mli \
@@ -69,6 +71,7 @@ SOURCES_ML = \
changeuid.ml \
python_script.ml \
create_libvirt_xml.ml \
+ create_kubevirt_yaml.ml \
qemuopts.ml \
openstack_image_properties.ml \
output_rhv_upload_cancel_source.ml \
@@ -81,6 +84,7 @@ SOURCES_ML = \
output.ml \
output_disk.ml \
output_glance.ml \
+ output_kubevirt.ml \
output_libvirt.ml \
output_null.ml \
output_openstack.ml \
diff --git a/output/create_kubevirt_yaml.ml b/output/create_kubevirt_yaml.ml
new file mode 100644
index 0000000000..205e9be38a
--- /dev/null
+++ b/output/create_kubevirt_yaml.ml
@@ -0,0 +1,128 @@
+(* virt-v2v
+ * Copyright (C) 2009-2022 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Printf
+
+open Std_utils
+open Tools_utils
+open Common_gettext.Gettext
+
+open Types
+open Utils
+open YAML
+
+let create_kubevirt_yaml source inspect
+ { guestcaps; target_buses; target_firmware; target_nics }
+ outdisk_name output_format output_name =
+ (* The body of the YAML contains various sections attached to
+ * a tree. We fill in these sections first.
+ *)
+ let metadata = ref [] in
+ let devices = ref [] in
+ let disks = ref [] in
+ let resources = ref [] in
+ let volumes = ref [] in
+
+ (* The guest name. *)
+ List.push_back metadata ("name", String output_name);
+
+ (* The one Windows example I have includes this clock section, and
+ * the other non-Windows examples do not. I'm not certain this
+ * is correct. XXX
+ *)
+ if inspect.i_type = "windows" then (
+ List.push_back resources (
+ "clock", Assoc [
+ "timer", Assoc [
+ "hpet", Assoc [ "present", Bool false ];
+ "hyperv", List [];
+ "pit", Assoc [ "tickPolicy", String "delay" ];
+ "rtc", Assoc [ "tickPolicy", String "catchup" ];
+ ];
+ "utc", List []
+ ]
+ )
+ );
+
+ (* XXX genid *)
+
+ (* Memory. *)
+ let memory_str = sprintf "%LdMi" (source.s_memory /^ 1024_L /^ 1024_L) in
+ List.push_back resources ("requests", Assoc ["memory", String
memory_str]);
+
+ (* # vCPUs. XXX vendor, model, topology *)
+ List.push_back resources ("cpu", Assoc ["cores", Int
source.s_vcpu]);
+
+ (* Machine features. *)
+ let features = List.map (fun name -> name, List []) source.s_features in
+ List.push_back resources ("features", Assoc features);
+
+ (* XXX firmware, display, sound *)
+
+ (* XXX guestcaps: rng, balloon, vsock, virtio 1.0 *)
+
+ (* We're using local ("host") disks here which is not realistic. *)
+ Array.iter (
+ function
+ | BusSlotEmpty ->
+ (* XXX How to place devices on the bus? *) ()
+ | BusSlotDisk d ->
+ let disk_id = sprintf "disk-%d" d.s_disk_id in
+ let disk = Assoc [
+ "disk", Assoc ["bus", String "virtio"];
+ "name", String disk_id
+ ] in
+ List.push_back disks disk;
+ let vol = Assoc [
+ "hostDisk", Assoc [
+ "path", String (outdisk_name d.s_disk_id);
+ "type", String "Disk";
+ ];
+ "name", String disk_id
+ ] in
+ List.push_back volumes vol
+ | BusSlotRemovable _ ->
+ (* XXX removables *) ()
+ ) target_buses.target_virtio_blk_bus;
+
+ (* XXX ide, scsi, floppy, NICs *)
+
+ (* Create the final document. *)
+ if !disks <> [] then
+ List.push_back devices ("disks", List !disks);
+ let domain = ref [] in
+ if !devices <> [] then
+ List.push_back domain ("devices", Assoc !devices);
+ List.push_back domain ("resources", Assoc !resources);
+
+ let spec = ref [] in
+ List.push_back spec ("domain", Assoc !domain);
+ if !volumes <> [] then
+ List.push_back spec ("volumes", List !volumes);
+ List.push_back spec ("terminationGracePeriodSeconds", Int 0);
+
+ let body = [
+ "#", String generated_by;
+ "apiVersion", String "kubevirt.io/v1";
+ "kind", String "VirtualMachineInstance";
+ "metadata", Assoc !metadata;
+ "spec", Assoc !spec;
+ ] in
+
+ (* Return the YAML document. *)
+ Doc (Assoc body)
diff --git a/output/create_kubevirt_yaml.mli b/output/create_kubevirt_yaml.mli
new file mode 100644
index 0000000000..2d7eec1cc5
--- /dev/null
+++ b/output/create_kubevirt_yaml.mli
@@ -0,0 +1,27 @@
+(* virt-v2v
+ * Copyright (C) 2009-2020 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(** Create kubevirt YAML for -o kubevirt *)
+
+val create_kubevirt_yaml : Types.source ->
+ Types.inspect -> Types.target_meta ->
+ (int -> string) -> string -> string ->
+ YAML.doc
+(** [create_kubevirt_yaml source inspect target_meta
+ target_features outdisk_map output_format output_name]
+ creates the Kubevirt machine description YAML document. *)
diff --git a/output/output_kubevirt.ml b/output/output_kubevirt.ml
new file mode 100644
index 0000000000..63ee8197c0
--- /dev/null
+++ b/output/output_kubevirt.ml
@@ -0,0 +1,96 @@
+(* virt-v2v
+ * Copyright (C) 2009-2022 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+open Printf
+open Unix
+
+open Std_utils
+open Tools_utils
+open Common_gettext.Gettext
+
+open Types
+open Utils
+
+open Output
+open Create_kubevirt_yaml
+
+module Kubevirt = struct
+ type poptions = output_allocation * string * string * string
+
+ type t = unit
+
+ let to_string options =
+ "-o kubevirt" ^
+ match options.output_storage with
+ | Some os -> " -os " ^ os
+ | None -> ""
+
+ let query_output_options () =
+ printf (f_"No output options can be used in this mode.\n")
+
+ let parse_options options source =
+ if options.output_options <> [] then
+ error (f_"no -oo (output options) are allowed here");
+ if options.output_password <> None then
+ error_option_cannot_be_used_in_output_mode "local" "-op";
+
+ (* -os must be set to a directory. *)
+ let output_storage =
+ match options.output_storage with
+ | None ->
+ error (f_"-o kubevirt: output directory was not specified, use '-os
/dir'")
+ | Some d when not (is_directory d) ->
+ error (f_"-os %s: output directory does not exist or is not a
directory") d
+ | Some d -> d in
+
+ let output_name = Option.default source.s_name options.output_name in
+
+ options.output_alloc, options.output_format, output_name, output_storage
+
+ let setup dir options source =
+ let disks = get_disks dir in
+ let output_alloc, output_format, output_name, output_storage = options in
+
+ List.iter (
+ fun (i, size) ->
+ let socket = sprintf "%s/out%d" dir i in
+ On_exit.unlink socket;
+
+ (* Create the actual output disk. *)
+ let outdisk = disk_path output_storage output_name i in
+ output_to_local_file output_alloc output_format outdisk size socket
+ ) disks
+
+ let finalize dir options () source inspect target_meta =
+ let output_alloc, output_format, output_name, output_storage = options in
+
+ let doc = create_kubevirt_yaml source inspect target_meta
+ (disk_path output_storage output_name)
+ output_format output_name in
+
+ let file = output_storage // output_name ^ ".yaml" in
+ with_open_out file (fun chan -> YAML.doc_to_chan chan doc);
+
+ if verbose () then (
+ eprintf "resulting kubevirt YAML:\n";
+ YAML.doc_to_chan Stdlib.stderr doc;
+ eprintf "\n%!";
+ )
+
+ let request_size = None
+end
diff --git a/output/output_kubevirt.mli b/output/output_kubevirt.mli
new file mode 100644
index 0000000000..a34aa33a5b
--- /dev/null
+++ b/output/output_kubevirt.mli
@@ -0,0 +1,21 @@
+(* virt-v2v
+ * Copyright (C) 2009-2022 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(** [-o kubevirt] output mode. *)
+
+module Kubevirt : Output.OUTPUT
diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 6df82cfce9..fcf5e2d4d0 100644
--- a/v2v/v2v.ml
+++ b/v2v/v2v.ml
@@ -193,6 +193,7 @@ let rec main () =
error (f_"%s option used more than once on the command line")
"-o";
match mode with
| "glance" -> output_mode := `Glance
+ | "kubevirt" -> output_mode := `Kubevirt
| "libvirt" -> output_mode := `Libvirt
| "disk" | "local" -> output_mode := `Disk
| "null" -> output_mode := `Null
@@ -249,7 +250,7 @@ let rec main () =
s_"Map network ‘in’ to ‘out’";
[ L"no-trim" ], Getopt.String ("-", no_trim_warning),
s_"Ignored for backwards compatibility";
- [ S 'o' ], Getopt.String
("glance|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm",
set_output_mode),
+ [ S 'o' ], Getopt.String
("glance|kubevirt|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm",
set_output_mode),
s_"Set output mode (default: libvirt)";
[ M"oa" ], Getopt.String ("sparse|preallocated",
set_output_alloc),
s_"Set output allocation mode";
@@ -389,6 +390,7 @@ read the man page virt-v2v(1).
pr "input:ova\n";
pr "input:vmx\n";
pr "output:glance\n";
+ pr "output:kubevirt\n";
pr "output:libvirt\n";
pr "output:local\n";
pr "output:null\n";
@@ -482,6 +484,7 @@ read the man page virt-v2v(1).
| `Null -> (module Output_null.Null)
| `QEmu -> (module Output_qemu.QEMU)
| `Glance -> (module Output_glance.Glance)
+ | `Kubevirt -> (module Output_kubevirt.Kubevirt)
| `Openstack -> (module Output_openstack.Openstack)
| `RHV_Upload -> (module Output_rhv_upload.RHVUpload)
| `RHV -> (module Output_rhv.RHV)
--
2.35.1
4:35 a.m.
On 04/25/22 15:55, Richard W.M. Jones wrote:
This is very bare-bones at the moment. It only has minimal
documentation and has no tests at all.
Nevertheless, this adds a new -o kubevirt mode, so you can import
guests into Kubevirt, a system which adds virtualization support to
Kubernetes[0]. Example of generated YAML metadata can be found at the
end of this cover email. Upstream examples of metadata to compare it
to can be found in [1].
I wasn't able to test this yet since my Kubernetes instance died and
no one knows how to fix it ...
I only bothered to map out the basic hardware and disks, there are
many to-dos which will require reading the Kubevirt source code to
finish.
Generating YAML is an adventure. The format is full of nasty
beartraps. What I'm doing is probably mostly safe, but I wouldn't be
surprised if there are security holes.
This must have been a lot of work, and not without significant amounts
of "head, meet desk"!
Acked-by: Laszlo Ersek <lersek(a)redhat.com>
Thank you!
Laszlo
Rich.
---
# generated by virt-v2v 2.1.1local,libvirt
apiVersion: kubevirt.io/v1
kind: VirtualMachineInstance
metadata:
name: fedora-35
spec:
domain:
devices:
disks:
- disk:
bus: virtio
name: disk-0
resources:
requests:
memory: 2048Mi
cpu:
cores: 1
features:
acpi: {}
apic: {}
pae: {}
volumes:
- hostDisk:
path: /var/tmp//fedora-35-sda
type: Disk
name: disk-0
terminationGracePeriodSeconds: 0
[0] https://github.com/kubevirt/kubevirt
[1] https://github.com/kubevirt/kubevirt/tree/main/examples
4:44 a.m.
On Tue, Apr 26, 2022 at 11:35:38AM +0200, Laszlo Ersek wrote:
On 04/25/22 15:55, Richard W.M. Jones wrote:
> This is very bare-bones at the moment. It only has minimal
> documentation and has no tests at all.
>
> Nevertheless, this adds a new -o kubevirt mode, so you can import
> guests into Kubevirt, a system which adds virtualization support to
> Kubernetes[0]. Example of generated YAML metadata can be found at the
> end of this cover email. Upstream examples of metadata to compare it
> to can be found in [1].
>
> I wasn't able to test this yet since my Kubernetes instance died and
> no one knows how to fix it ...
>
> I only bothered to map out the basic hardware and disks, there are
> many to-dos which will require reading the Kubevirt source code to
> finish.
>
> Generating YAML is an adventure. The format is full of nasty
> beartraps. What I'm doing is probably mostly safe, but I wouldn't be
> surprised if there are security holes.
This must have been a lot of work, and not without significant amounts
of "head, meet desk"!
Acked-by: Laszlo Ersek <lersek(a)redhat.com>
I realised that I _can_ actually test this (since it relies on basic
Kubevirt, which is still working, not Konveyor, broken). And I fixed
a few things and am adding support for some of the missing features.
So I'm going to let this one stew out of tree for a bit longer and
post a v2 later with more features.
Thanks,
Rich.
Thank you!
Laszlo
>
> Rich.
>
> ---
> # generated by virt-v2v 2.1.1local,libvirt
> apiVersion: kubevirt.io/v1
> kind: VirtualMachineInstance
> metadata:
> name: fedora-35
> spec:
> domain:
> devices:
> disks:
> - disk:
> bus: virtio
> name: disk-0
> resources:
> requests:
> memory: 2048Mi
> cpu:
> cores: 1
> features:
> acpi: {}
> apic: {}
> pae: {}
> volumes:
> - hostDisk:
> path: /var/tmp//fedora-35-sda
> type: Disk
> name: disk-0
> terminationGracePeriodSeconds: 0
>
>
> [0] https://github.com/kubevirt/kubevirt
> [1] https://github.com/kubevirt/kubevirt/tree/main/examples
>
>
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
755
days inactive
756
days old
4 comments
2 participants
participants (2)
-
Laszlo Ersek -
Richard W.M. Jones