Skip to content

Commit 2004028

Browse files
anrsanrs
anrs
authored andcommitted
feat: creating guests from a user-captured image.
1 parent 4eb01b2 commit 2004028

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

engine/virt/virt.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ const (
3131
GRPCPrefixKey = "virt-grpc://"
3232
// DmiUUIDKey indicates the key within deploy info.
3333
DmiUUIDKey = "DMIUUID"
34+
// ImageUserKey indicates the image's owner
35+
ImageUserKey = "ImageUser"
3436
)
3537

3638
// Virt implements the core engine.API interface.
@@ -157,13 +159,11 @@ func (v *Virt) VirtualizationCreate(ctx context.Context, opts *enginetypes.Virtu
157159
CPU: int(opts.Quota),
158160
Mem: opts.Memory,
159161
ImageName: opts.Image,
162+
ImageUser: opts.User,
160163
Volumes: vols,
161164
Labels: opts.Labels,
162165
AncestorID: opts.AncestorWorkloadID,
163-
}
164-
165-
if dmiUUID, exists := opts.Labels[DmiUUIDKey]; exists {
166-
req.DmiUUID = dmiUUID
166+
DmiUUID: opts.Labels[DmiUUIDKey],
167167
}
168168

169169
var resp virttypes.Guest

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/opencontainers/runc v0.1.1 // indirect
3535
github.com/patrickmn/go-cache v2.1.0+incompatible
3636
github.com/pkg/errors v0.9.1
37-
github.com/projecteru2/libyavirt v0.0.0-20210430061544-6e7bba9e434a
37+
github.com/projecteru2/libyavirt v0.0.0-20210506084619-9ba72c7c2ae3
3838
github.com/prometheus/client_golang v1.7.1
3939
github.com/sanity-io/litter v1.3.0
4040
github.com/sethvargo/go-signalcontext v0.1.0

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -355,6 +355,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
355355
github.com/projecteru2/libyavirt v0.0.0-20201204100854-3646a3f5f5e5/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
356356
github.com/projecteru2/libyavirt v0.0.0-20210430061544-6e7bba9e434a h1:YGrEgfjitY8LV6WGGpNhgpUwhbCin2feTYFWa8DvL0s=
357357
github.com/projecteru2/libyavirt v0.0.0-20210430061544-6e7bba9e434a/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
358+
github.com/projecteru2/libyavirt v0.0.0-20210506084619-9ba72c7c2ae3 h1:HPjZPr0PcaHJ0KQ/xzyZbL1p8xuRwIDHWGlgfUSvVEU=
359+
github.com/projecteru2/libyavirt v0.0.0-20210506084619-9ba72c7c2ae3/go.mod h1:9/SNmdphwl12ubwihkRa9YtOozM6liYLDxsricra1mY=
358360
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
359361
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
360362
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=

0 commit comments

Comments
 (0)