From 26bdbfe11de823abb7c5c7da3d2aefc3aadf2ff5 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Thu, 26 Mar 2020 02:01:57 -0700 Subject: [PATCH] update references to docker podman --- site/content/en/_index.html | 8 +++++--- site/content/en/docs/Contributing/triage.md | 1 + .../en/docs/Reference/Drivers/includes/podman_usage.inc | 2 +- site/content/en/docs/Reference/Drivers/podman.md | 2 +- site/content/en/docs/Reference/disk_cache.md | 2 +- site/content/en/docs/Reference/persistent_volumes.md | 2 +- site/content/en/docs/Tutorials/continuous_integration.md | 8 ++++++-- site/content/en/docs/Tutorials/nvidia_gpu.md | 2 +- .../en/docs/Tutorials/untrusted_root_certificate.md | 6 +++--- 9 files changed, 20 insertions(+), 13 deletions(-) diff --git a/site/content/en/_index.html b/site/content/en/_index.html index 8687b84c25..05ade99efe 100644 --- a/site/content/en/_index.html +++ b/site/content/en/_index.html @@ -83,12 +83,14 @@ A single command away from reproducing your production environment, from the com {{% /blocks/feature %}} {{% blocks/feature icon="fa-thumbs-up" title="Cross-platform" %}} -- Bare-metal -- HyperKit -- Hyper-V - KVM +- Docker +- HyperKit +- Bare-metal - VirtualBox +- Hyper-V - VMware +- Podman {{% /blocks/feature %}} {{< /blocks/section >}} diff --git a/site/content/en/docs/Contributing/triage.md b/site/content/en/docs/Contributing/triage.md index 318312107b..93b3c403e5 100644 --- a/site/content/en/docs/Contributing/triage.md +++ b/site/content/en/docs/Contributing/triage.md @@ -62,6 +62,7 @@ If the issue is specific to an operating system, hypervisor, container, addon, o - `co/kvm2` - `co/none-driver` - `co/docker-driver` + - `co/podman-driver` - `co/virtualbox` **co/[kubernetes component]** - When the issue appears specific to a k8s component diff --git a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc index 76720f262a..9962043165 100644 --- a/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc +++ b/site/content/en/docs/Reference/Drivers/includes/podman_usage.inc @@ -1,7 +1,7 @@ ## experimental This is an experimental driver. please use it only for experimental reasons. -for a better kubernetes in container experience, use docker [driver](https://5e7c6ab90d754e000860cdfd--kubernetes-sigs-minikube.netlify.com/docs/reference/drivers/docker/). +for a better kubernetes in container experience, use docker [driver](https://minikube.sigs.k8s.io/docs/reference/drivers/docker). ## Install Podman diff --git a/site/content/en/docs/Reference/Drivers/podman.md b/site/content/en/docs/Reference/Drivers/podman.md index 2b83cf3ea6..17425b1e58 100644 --- a/site/content/en/docs/Reference/Drivers/podman.md +++ b/site/content/en/docs/Reference/Drivers/podman.md @@ -9,7 +9,7 @@ description: > ## Overview -The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](docs/reference/drivers/docker) driver. +The podman driver is another kubernetes in container driver for minikube. simmilar to [docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker/) driver. podman driver is currently experimental. and only supported on Linux and MacOs (with a remote podman server) diff --git a/site/content/en/docs/Reference/disk_cache.md b/site/content/en/docs/Reference/disk_cache.md index 84d43112ef..24590727d5 100644 --- a/site/content/en/docs/Reference/disk_cache.md +++ b/site/content/en/docs/Reference/disk_cache.md @@ -4,7 +4,7 @@ linkTitle: "Disk cache" weight: 6 date: 2019-08-01 description: > - Cache Rules Everything Around Minikube + Cache Rules Everything Around minikube --- minikube has built-in support for caching downloaded resources into `$MINIKUBE_HOME/cache`. Here are the important file locations: diff --git a/site/content/en/docs/Reference/persistent_volumes.md b/site/content/en/docs/Reference/persistent_volumes.md index 6b7a38b83b..02e90bc703 100644 --- a/site/content/en/docs/Reference/persistent_volumes.md +++ b/site/content/en/docs/Reference/persistent_volumes.md @@ -7,7 +7,7 @@ description: > About persistent volumes (hostPath) --- -minikube supports [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) of type `hostPath` out of the box. These PersistentVolumes are mapped to a directory inside the running Minikube instance (usually a VM, unless you use `--driver=none`, `--driver=docker`, or `--driver=podman`). For more information on how this works, read the Dynamic Provisioning section below. +minikube supports [PersistentVolumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) of type `hostPath` out of the box. These PersistentVolumes are mapped to a directory inside the running minikube instance (usually a VM, unless you use `--driver=none`, `--driver=docker`, or `--driver=podman`). For more information on how this works, read the Dynamic Provisioning section below. ## A note on mounts, persistence, and minikube hosts diff --git a/site/content/en/docs/Tutorials/continuous_integration.md b/site/content/en/docs/Tutorials/continuous_integration.md index 4dad6cc9ed..1a55a58150 100644 --- a/site/content/en/docs/Tutorials/continuous_integration.md +++ b/site/content/en/docs/Tutorials/continuous_integration.md @@ -9,13 +9,13 @@ description: > ## Overview -Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. +Most continuous integration environments are already running inside a VM, and may not support nested virtualization. The `none` driver was designed for this use case. or you could alternatively use the [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker). ## Prerequisites - VM running a systemd based Linux distribution -## Tutorial +## using none driver Here is an example, that runs minikube from a non-root user, and ensures that the latest stable kubectl is installed: @@ -39,3 +39,7 @@ touch $KUBECONFIG sudo -E minikube start --driver=none ``` + +## Alternative ways + +you could alternatively use minikube's container drivers such as [Docker](https://minikube.sigs.k8s.io/docs/reference/drivers/docker) or [Podman](https://minikube.sigs.k8s.io/docs/reference/drivers/podman). \ No newline at end of file diff --git a/site/content/en/docs/Tutorials/nvidia_gpu.md b/site/content/en/docs/Tutorials/nvidia_gpu.md index 68846ae15b..4e9f561490 100644 --- a/site/content/en/docs/Tutorials/nvidia_gpu.md +++ b/site/content/en/docs/Tutorials/nvidia_gpu.md @@ -98,7 +98,7 @@ to expose GPUs with `--driver=kvm2`. Please don't mix these instructions. ## Why does minikube not support NVIDIA GPUs on macOS? -VM drivers supported by minikube for macOS doesn't support GPU passthrough: +drivers supported by minikube for macOS doesn't support GPU passthrough: - [mist64/xhyve#108](https://github.com/mist64/xhyve/issues/108) - [moby/hyperkit#159](https://github.com/moby/hyperkit/issues/159) diff --git a/site/content/en/docs/Tutorials/untrusted_root_certificate.md b/site/content/en/docs/Tutorials/untrusted_root_certificate.md index 77093d76f3..d1b857aa73 100644 --- a/site/content/en/docs/Tutorials/untrusted_root_certificate.md +++ b/site/content/en/docs/Tutorials/untrusted_root_certificate.md @@ -11,7 +11,7 @@ description: > Most organizations deploy their own Root Certificate and CA service inside the corporate networks. Internal websites, image repositories and other resources may install SSL server certificates issued by this CA service for security and privacy concerns. -You may install the Root Certificate into the minikube VM to access these corporate resources within the cluster. +You may install the Root Certificate into the minikube cluster to access these corporate resources within the cluster. ## Prerequisites @@ -26,13 +26,13 @@ You may install the Root Certificate into the minikube VM to access these corpor openssl x509 -inform der -in my_company.cer -out my_company.pem ``` -* You may need to delete existing minikube VM +* You may need to delete existing minikube cluster ```shell minikube delete ``` -* Copy the certificate before creating the minikube VM +* Copy the certificate before creating the minikube cluster ```shell mkdir -p $HOME/.minikube/certs