Merge pull request #2184 from devimc/topic/virtcontainers/fixFC019

support firecracker 0.19.0

versions.yaml

@@ -76,7 +76,7 @@ assets:
       uscan-url: >-
         https://github.com/firecracker-microvm/firecracker/tags
         .*/v?(\d\S+)\.tar\.gz
-      version: "v0.18.0"
+      version: "v0.19.0"
 
     nemu:
       description: "Reduced-emulation VMM that uses KVM"

virtcontainers/fc.go

@@ -69,7 +69,7 @@ const (
 )
 
 // Specify the minimum version of firecracker supported
-var fcMinSupportedVersion = semver.MustParse("0.18.0")
+var fcMinSupportedVersion = semver.MustParse("0.19.0")
 
 var fcKernelParams = append(commonVirtioblkKernelRootParams, []Param{
 	// The boot source is the first partition of the first block device added
@@ -299,7 +299,7 @@ func (fc *firecracker) vmRunning() bool {
 		return false
 	case models.InstanceInfoStateRunning:
 		return true
-	case models.InstanceInfoStateUninitialized, models.InstanceInfoStateHalting, models.InstanceInfoStateHalted:
+	case models.InstanceInfoStateUninitialized:
 		return false
 	default:
 		return false
@@ -784,18 +784,17 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error {
 		udsPath = filepath.Join("/", defaultHybridVSocketName)
 	}
 
-	vsockParams := ops.NewPutGuestVsockByIDParams()
+	vsockParams := ops.NewPutGuestVsockParams()
 	vsockID := "root"
 	ctxID := defaultGuestVSockCID
 	vsock := &models.Vsock{
 		GuestCid: &ctxID,
 		UdsPath:  &udsPath,
 		VsockID:  &vsockID,
 	}
-	vsockParams.SetID(vsockID)
 	vsockParams.SetBody(vsock)
 
-	_, err := fc.client().Operations.PutGuestVsockByID(vsockParams)
+	_, err := fc.client().Operations.PutGuestVsock(vsockParams)
 	if err != nil {
 		return err
 	}

virtcontainers/pkg/firecracker/README

@@ -5,8 +5,8 @@ The code is generated via go-swagger
 https://github.com/go-swagger/go-swagger#licensing
 
 ```
-swagger generate model -f ./firecracker-experimental.yaml --model-package=client/models --client-package=client
-swagger generate client -f ./firecracker-experimental.yaml --model-package=client/models --client-package=client
+swagger generate model -f ./firecracker.yaml --model-package=client/models --client-package=client
+swagger generate client -f ./firecracker.yaml --model-package=client/models --client-package=client
 ```
 
 ```