From 41e3595b9e8d35c24e8cd97037cc1c7045779ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Mon, 1 Jul 2019 15:39:20 +0300 Subject: [PATCH] upgrade firecracker version to v0.17.0 --- go.mod | 2 +- go.sum | 4 ++-- hack/FIRECRACKER_VERSION | 2 +- pkg/container/firecracker.go | 9 +++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 27cafe444..9cc98464c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/docker/go-connections v0.4.0 // indirect - github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 + github.com/firecracker-microvm/firecracker-go-sdk v0.15.2-0.20190627223500-b2e8284e890c github.com/freddierice/go-losetup v0.0.0-20170407175016-fc9adea44124 github.com/goombaio/namegenerator v0.0.0-20181006234301-989e774b106e github.com/gorilla/mux v1.7.2 // indirect diff --git a/go.sum b/go.sum index 46f786787..c2ee5ecc3 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,8 @@ github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/firecracker-microvm/firecracker-go-sdk v0.15.1 h1:xtNAtwXMKXctB/CMn8tdTfpEzfqPUfqm7+Y3pYUSYZc= -github.com/firecracker-microvm/firecracker-go-sdk v0.15.1/go.mod h1:QcNsz2gYkcTI/zAQl3dYeLwf7KxtjKnt7aGklhn9yYk= +github.com/firecracker-microvm/firecracker-go-sdk v0.15.2-0.20190627223500-b2e8284e890c h1:jAAxKV5SD/y2nNKNLHgAUmfgbrvfN4xBiKR+b2qK2pM= +github.com/firecracker-microvm/firecracker-go-sdk v0.15.2-0.20190627223500-b2e8284e890c/go.mod h1:QcNsz2gYkcTI/zAQl3dYeLwf7KxtjKnt7aGklhn9yYk= github.com/freddierice/go-losetup v0.0.0-20170407175016-fc9adea44124 h1:TVfi5xMshZAXzVXozESk8bi0JSTPwHkx7qtLOkkcu/c= github.com/freddierice/go-losetup v0.0.0-20170407175016-fc9adea44124/go.mod h1:zAk7fcFx45euzK9Az14j6Hd9n8Cwhnjp/NBfhSIAmFg= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= diff --git a/hack/FIRECRACKER_VERSION b/hack/FIRECRACKER_VERSION index 49dd460a9..2bb97efb7 100644 --- a/hack/FIRECRACKER_VERSION +++ b/hack/FIRECRACKER_VERSION @@ -1 +1 @@ -v0.16.0 \ No newline at end of file +v0.17.0 \ No newline at end of file diff --git a/pkg/container/firecracker.go b/pkg/container/firecracker.go index c52d915d5..135718878 100644 --- a/pkg/container/firecracker.go +++ b/pkg/container/firecracker.go @@ -45,8 +45,9 @@ func ExecuteFirecracker(md *vmmd.VMMetadata, dhcpIfaces []DHCPInterface) error { }}, NetworkInterfaces: networkInterfaces, MachineCfg: models.MachineConfiguration{ - VcpuCount: od.VCPUs, - MemSizeMib: od.Memory, + VcpuCount: &od.VCPUs, + MemSizeMib: &od.Memory, + HtEnabled: boolPtr(true), }, //JailerCfg: firecracker.JailerConfig{ // GID: firecracker.Int(0), @@ -131,3 +132,7 @@ func installSignalHandlers(ctx context.Context, m *firecracker.Machine) { } }() } + +func boolPtr(val bool) *bool { + return &val +} \ No newline at end of file