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

Use the same kind of named /var mount for podman 

The internal anonymous mounts do not seem to have the same
issues as the external path mounts, so we can do all of /var
pull/7631/head
Anders F Björklund 2020-04-14 21:39:00 +02:00
parent 45ec38d2e6
commit 024cd6b108
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/drivers/kic/oci/oci.go
View File

@ -19,7 +19,6 @@ package oci
import (
"context"
"os"
"path/filepath"
"time"
"bufio"
@ -29,7 +28,6 @@ import (
"github.com/golang/glog"
"github.com/pkg/errors"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/localpath"
"k8s.io/minikube/pkg/minikube/out"
"k8s.io/minikube/pkg/util/retry"
@ -136,25 +134,8 @@ func CreateContainerNode(p CreateParams) error {
}
if p.OCIBinary == Podman { // enable execing in /var
// volume path in minikube home folder to mount to /var
hostVarVolPath := filepath.Join(localpath.MiniPath(), "machines", p.Name, "var", "lib")
if err := os.MkdirAll(hostVarVolPath, 0755); err != nil {
return errors.Wrapf(err, "create var dir %s", hostVarVolPath)
}
if err := os.Mkdir(fmt.Sprintf("%s/%s", hostVarVolPath, "minikube"), 0711); err != nil {
return errors.Wrapf(err, "create var dir %s/%s", hostVarVolPath, "minikube")
}
hostVarLibSubdirs := []string{"docker", "containerd", "containers", "kubelet", "cni"}
for _, subdir := range hostVarLibSubdirs {
if err := os.Mkdir(fmt.Sprintf("%s/%s", hostVarVolPath, subdir), 0711); err != nil {
return errors.Wrapf(err, "create var dir %s/%s", hostVarVolPath, subdir)
}
}
// podman mounts var/lib with no-exec by default https://github.com/containers/libpod/issues/5103
runArgs = append(runArgs, "--volume", fmt.Sprintf("%s/minikube:/var/lib/minikube:exec", hostVarVolPath))
for _, subdir := range hostVarLibSubdirs {
runArgs = append(runArgs, "--volume", fmt.Sprintf("%s/%s:/var/lib/%s", hostVarVolPath, subdir, subdir))
}
runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", p.Name))
}
if p.OCIBinary == Docker {
runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var", p.Name))