From a188a802893f4511975fe3c397b86ecf576bfeb9 Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Thu, 15 Oct 2020 20:11:31 +0000 Subject: [PATCH] ci: clarify the supported vm-driver of minikube scripts We can't use vm-drivers other than "docker" or "none" in minikube scripts. It's because there is no device for OSD. Signed-off-by: Satoru Takeuchi --- tests/README.md | 6 ++++-- tests/scripts/dind-cluster.sh | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/README.md b/tests/README.md index 6963d4152..c4eed0304 100644 --- a/tests/README.md +++ b/tests/README.md @@ -24,10 +24,12 @@ to your command line tool of choice. ### Install Kubernetes You can choose any Kubernetes flavor of your choice. The test framework only depends on kubectl being configured. The framework also provides scripts to install Kubernetes. There are two scripts to start the cluster: -1. **Minikube** (recommended for MacOS): Run [minikube.sh](/tests/scripts/minikube.sh) to setup a single-node Minikube Kubernetes. 1. **Kubeadm** (recommended for Ubuntu): run [kubeadm.sh](/tests/scripts/kubeadm.sh) to setup a single-node K8s cluster using kubeadm +1. **Minikube** (recommended for non-Ubuntu): Run [minikube.sh](/tests/scripts/minikube.sh) to setup a single-node Minikube Kubernetes. -#### Minikube (recommended for MacOS) +Minikube scripts only support "docker" and "none" as vm-driver. + +#### Minikube (recommended for non-Ubuntu) Starting the cluster on Minikube is as simple as running: ```console tests/scripts/minikube.sh up diff --git a/tests/scripts/dind-cluster.sh b/tests/scripts/dind-cluster.sh index 0ffba6638..3f9574fb8 100755 --- a/tests/scripts/dind-cluster.sh +++ b/tests/scripts/dind-cluster.sh @@ -129,9 +129,6 @@ function dind::create-volume { # This includes virtlet, for instance. Also this may be # useful in future if we want DIND nodes to pass # preflight checks. -# Unfortunately we can't do this when using Mac Docker -# (unless a remote docker daemon on Linux is used) -# NB: there's no /boot on recent Mac dockers function dind::prepare-sys-mounts { if [[ ! ${is_moby_linux} ]]; then sys_volume_args=() @@ -146,7 +143,6 @@ function dind::prepare-sys-mounts { if ! dind::volume-exists kubeadm-dind-sys; then dind::step "Saving a copy of docker host's /lib/modules" dind::create-volume kubeadm-dind-sys - # Use a dirty nsenter trick to fool Docker on Mac and grab system # /lib/modules into sys.tar file on kubeadm-dind-sys volume. local nsenter="nsenter --mount=/proc/1/ns/mnt --" docker run \