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

Merge pull request #5026 from tstromberg/drvmnt 

Restore --disable-driver-mounts flag
pull/4814/head
Thomas Strömberg 2019-08-09 07:49:05 -07:00 committed by GitHub
parent 1f48364487 32c405d44d
commit 4a335cbd56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/minikube/cmd/start.go
View File

@ -169,6 +169,7 @@ func initKubernetesFlags() {
// initDriverFlags inits the commandline flags for vm drivers // initDriverFlags inits the commandline flags for vm drivers
func initDriverFlags() { func initDriverFlags() {
startCmd.Flags().String(vmDriver, constants.DefaultVMDriver, fmt.Sprintf("VM driver is one of: %v", constants.SupportedVMDrivers)) startCmd.Flags().String(vmDriver, constants.DefaultVMDriver, fmt.Sprintf("VM driver is one of: %v", constants.SupportedVMDrivers))
startCmd.Flags().Bool(disableDriverMounts, false, "Disables the filesystem mounts provided by the hypervisors")
// kvm2 // kvm2
startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (only supported with KVM driver)") startCmd.Flags().String(kvmNetwork, "default", "The KVM network name. (only supported with KVM driver)")

12
test/integration/start_stop_delete_test.go
View File

@ -44,7 +44,7 @@ func TestStartStop(t *testing.T) {
name string name string
args []string args []string
}{ }{
{"oldest", []string{ // nocache_oldest {"oldest", []string{
"--cache-images=false", "--cache-images=false",
fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion), fmt.Sprintf("--kubernetes-version=%s", constants.OldestKubernetesVersion),
// default is the network created by libvirt, if we change the name minikube won't boot // default is the network created by libvirt, if we change the name minikube won't boot
@ -52,7 +52,7 @@ func TestStartStop(t *testing.T) {
"--kvm-network=default", "--kvm-network=default",
"--kvm-qemu-uri=qemu:///system", "--kvm-qemu-uri=qemu:///system",
}}, }},
{"cni", []string{ // feature_gates_newest_cni {"cni", []string{
"--feature-gates", "--feature-gates",
"ServerSideApply=true", "ServerSideApply=true",
"--network-plugin=cni", "--network-plugin=cni",
@ -60,15 +60,15 @@ func TestStartStop(t *testing.T) {
"--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16", "--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16",
fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion), fmt.Sprintf("--kubernetes-version=%s", constants.NewestKubernetesVersion),
}}, }},
{"containerd", []string{ // containerd_and_non_default_apiserver_port {"containerd", []string{
"--container-runtime=containerd", "--container-runtime=containerd",
"--docker-opt containerd=/var/run/containerd/containerd.sock", "--docker-opt containerd=/var/run/containerd/containerd.sock",
"--apiserver-port=8444", "--apiserver-port=8444",
}}, }},
{"crio", []string{ // crio_ignore_preflights {"crio", []string{
"--container-runtime=crio", "--container-runtime=crio",
"--extra-config", "--disable-driver-mounts",
"kubeadm.ignore-preflight-errors=SystemVerification", "--extra-config=kubeadm.ignore-preflight-errors=SystemVerification",
}}, }},
} }