diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/permissions b/deploy/iso/minikube-iso/board/coreos/minikube/permissions index 02ad93232e96..8e87a5afcaa7 100644 --- a/deploy/iso/minikube-iso/board/coreos/minikube/permissions +++ b/deploy/iso/minikube-iso/board/coreos/minikube/permissions @@ -1,4 +1,2 @@ # https://buildroot.org/downloads/manual/manual.html#makedev-syntax -/usr/bin/toolbox f 755 0 0 - - - - - - diff --git a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox deleted file mode 100644 index 3f38c70ec17a..000000000000 --- a/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/toolbox +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash - -set -e -set -o pipefail - -machine=$(uname -m) - -case ${machine} in - aarch64 ) - TOOLBOX_DOCKER_IMAGE=arm64v8/fedora - TOOLBOX_DOCKER_TAG=29 - ;; - x86_64 ) - TOOLBOX_DOCKER_IMAGE=fedora - TOOLBOX_DOCKER_TAG=29 - ;; - * ) - echo "Warning: Unknown machine type ${machine}" >&2 - ;; -esac - -TOOLBOX_USER=root -TOOLBOX_DIRECTORY="/var/lib/toolbox" -TOOLBOX_BIND="--bind=/:/media/root --bind=/usr:/media/root/usr --bind=/run:/media/root/run" -# Ex: "--setenv=KEY=VALUE" -TOOLBOX_ENV="" - -toolboxrc="${HOME}"/.toolboxrc - -# System defaults -if [ -f "/etc/default/toolbox" ]; then - source "/etc/default/toolbox" -fi - -# User overrides -if [ -f "${toolboxrc}" ]; then - source "${toolboxrc}" -fi - -if [[ -n "${TOOLBOX_DOCKER_IMAGE}" ]] && [[ -n "${TOOLBOX_DOCKER_TAG}" ]]; then - TOOLBOX_NAME=${TOOLBOX_DOCKER_IMAGE}-${TOOLBOX_DOCKER_TAG} - have_docker_image="y" -fi - -machinename=$(echo "${USER}-${TOOLBOX_NAME}" | sed -r 's/[^a-zA-Z0-9_.-]/_/g') -machinepath="${TOOLBOX_DIRECTORY}/${machinename}" -osrelease="${machinepath}/etc/os-release" -if [ ! -f "${osrelease}" ] || systemctl is-failed -q "${machinename}" ; then - sudo mkdir -p "${machinepath}" - sudo chown "${USER}:" "${machinepath}" - - if [[ -n "${have_docker_image}" ]]; then - riid=$(sudo --preserve-env rkt --insecure-options=image fetch "docker://${TOOLBOX_DOCKER_IMAGE}:${TOOLBOX_DOCKER_TAG}") - sudo --preserve-env rkt image extract --overwrite --rootfs-only "${riid}" "${machinepath}" - sudo --preserve-env rkt image rm "${riid}" - else - echo "Error: No toolbox filesystem specified." >&2 - exit 1 - fi - sudo touch "${osrelease}" -fi - -# Special case for when SSH tries to pass a shell command with -c -if [ "x${1-}" == x-c ]; then - set /bin/sh "$@" -fi - -sudo systemd-nspawn \ - --directory="${machinepath}" \ - --capability=all \ - --share-system \ - ${TOOLBOX_BIND} \ - ${TOOLBOX_ENV} \ - --user="${TOOLBOX_USER}" "$@" diff --git a/docs/README.md b/docs/README.md index 33fe2ce50372..d76126f0fa64 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,7 @@ ## Cluster Configuration -* **Alternative Runtimes** ([alternative_runtimes.md](alternative_runtimes.md)): How to run minikube with rkt as the container runtime +* **Alternative Runtimes** ([alternative_runtimes.md](alternative_runtimes.md)): How to run minikube without Docker as the container runtime * **Environment Variables** ([env_vars.md](env_vars.md)): The different environment variables that minikube understands diff --git a/docs/debugging.md b/docs/debugging.md index cb02133ffac8..0e0e69960c37 100644 --- a/docs/debugging.md +++ b/docs/debugging.md @@ -10,8 +10,3 @@ To debug issues with minikube (not *Kubernetes* but **minikube** itself), you ca Example: `minikube start --v=1` Will start minikube and output all warnings to stdout. - -If you need to access additional tools for debugging, minikube also includes the [CoreOS toolbox](/~https://github.com/coreos/toolbox) - -You can ssh into the toolbox and access these additional commands using: -`minikube ssh toolbox`