Merge pull request #8057 from afbjorklund/podman-tar

Don't run the extraction tar container for podman
pull/8071/head
Medya Ghazizadeh 2020-05-11 19:22:48 +00:00 committed by GitHub
commit d2ae2b35a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions

View File

@ -122,6 +122,7 @@ func (d *Driver) Create() error {
}
var waitForPreload sync.WaitGroup
if d.NodeConfig.OCIBinary == oci.Docker {
waitForPreload.Add(1)
go func() {
defer waitForPreload.Done()
@ -138,6 +139,10 @@ func (d *Driver) Create() error {
glog.Infof("duration metric: took %f seconds to extract preloaded images to volume", time.Since(t).Seconds())
}
}()
} else {
// driver == "podman"
glog.Info("Driver isn't docker, skipping extracting preloaded images")
}
if err := oci.CreateContainerNode(params); err != nil {
return errors.Wrap(err, "create kic node")