kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
parent 6b97ee8ee2 cac41495cf
commit d2ae2b35a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/drivers/kic/kic.go
View File

@ -122,22 +122,27 @@ func (d *Driver) Create() error {
} }
var waitForPreload sync.WaitGroup var waitForPreload sync.WaitGroup
waitForPreload.Add(1) if d.NodeConfig.OCIBinary == oci.Docker {
go func() { waitForPreload.Add(1)
defer waitForPreload.Done() go func() {
// If preload doesn't exist, don't bother extracting tarball to volume defer waitForPreload.Done()
if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) { // If preload doesn't exist, don't bother extracting tarball to volume
return if !download.PreloadExists(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime) {
} return
t := time.Now() }
glog.Infof("Starting extracting preloaded images to volume ...") t := time.Now()
// Extract preloaded images to container glog.Infof("Starting extracting preloaded images to volume ...")
if err := oci.ExtractTarballToVolume(d.NodeConfig.OCIBinary, download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil { // Extract preloaded images to container
glog.Infof("Unable to extract preloaded tarball to volume: %v", err) if err := oci.ExtractTarballToVolume(d.NodeConfig.OCIBinary, download.TarballPath(d.NodeConfig.KubernetesVersion, d.NodeConfig.ContainerRuntime), params.Name, BaseImage); err != nil {
} else { glog.Infof("Unable to extract preloaded tarball to volume: %v", err)
glog.Infof("duration metric: took %f seconds to extract preloaded images to volume", time.Since(t).Seconds()) } else {
} 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 { if err := oci.CreateContainerNode(params); err != nil {
return errors.Wrap(err, "create kic node") return errors.Wrap(err, "create kic node")