From 24971a5ff5661805fb464c143ba9347efc46e9e3 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 8 May 2020 19:56:38 -0700 Subject: [PATCH 1/5] docker/podman fail on non-amd64 systems --- pkg/minikube/registry/drvs/docker/docker.go | 4 ++++ pkg/minikube/registry/drvs/podman/podman.go | 4 ++++ site/content/en/docs/drivers/docker.md | 3 +++ .../en/docs/drivers/includes/docker_usage.inc | 6 ++++-- site/content/en/docs/drivers/podman.md | 12 +++++++++++- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index ad3d3a4885..0b7bd4939a 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -71,6 +71,10 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { func status() registry.State { docURL := "https://minikube.sigs.k8s.io/docs/drivers/docker/" + if runtime.GOARCH != "amd64" { + return registry.State{Error: fmt.Errorf("doker driver is not supported on %q systems yet",runtime.GOARCH ), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} + } + _, err := exec.LookPath(oci.Docker) if err != nil { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Docker", Doc: docURL} diff --git a/pkg/minikube/registry/drvs/podman/podman.go b/pkg/minikube/registry/drvs/podman/podman.go index 4f22fc2c74..89dab84819 100644 --- a/pkg/minikube/registry/drvs/podman/podman.go +++ b/pkg/minikube/registry/drvs/podman/podman.go @@ -74,6 +74,10 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { func status() registry.State { docURL := "https://minikube.sigs.k8s.io/docs/drivers/podman/" + if runtime.GOARCH != "amd64" { + return registry.State{Error: fmt.Errorf("podman driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} + } + podman, err := exec.LookPath(oci.Podman) if err != nil { return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Podman", Doc: docURL} diff --git a/site/content/en/docs/drivers/docker.md b/site/content/en/docs/drivers/docker.md index 72e187a887..f1ca323c3a 100644 --- a/site/content/en/docs/drivers/docker.md +++ b/site/content/en/docs/drivers/docker.md @@ -19,6 +19,8 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta ## Known Issues +- Docker driver is not supported on non-amd64 architectures such as arm yet. For non-amd64 archs please use [other drivers]({{< ref "/docs/drivers/" >}} + - On macOS, containers might get hung and require a restart of Docker for Desktop. See [docker/for-mac#1835](https://github.com/docker/for-mac/issues/1835) - The `ingress`, `ingress-dns` and `registry` addons are currently only supported on Linux. See [#7332](https://github.com/kubernetes/minikube/issues/7332) and [#7535](https://github.com/kubernetes/minikube/issues/7535) @@ -28,6 +30,7 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta `sudo mkdir /sys/fs/cgroup/systemd && sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd`. + ## Troubleshooting [comment]: <> (this title is used in the docs links, don't change) diff --git a/site/content/en/docs/drivers/includes/docker_usage.inc b/site/content/en/docs/drivers/includes/docker_usage.inc index e426375e15..8b1ad0533a 100644 --- a/site/content/en/docs/drivers/includes/docker_usage.inc +++ b/site/content/en/docs/drivers/includes/docker_usage.inc @@ -1,6 +1,7 @@ -## Install Docker +## Requirements -- [Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc) +- [Install Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc) +- amd64 system. ## Usage @@ -14,3 +15,4 @@ To make docker the default driver: ```shell minikube config set driver docker ``` + diff --git a/site/content/en/docs/drivers/podman.md b/site/content/en/docs/drivers/podman.md index 93854fa899..8e60cd2b58 100644 --- a/site/content/en/docs/drivers/podman.md +++ b/site/content/en/docs/drivers/podman.md @@ -11,7 +11,14 @@ aliases: This driver is experimental and in active development. Help wanted! {{% /pageinfo %}} -The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is experimental, and only supported on Linux and macOS (with a remote podman server) +The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is experimental, and only supported on Linux and macOS (with a remote podman server). + + + +## Requirements +- amd64 system +- Latest version of [Podman](https://podman.io/getting-started/installation) + ## Try it with CRI-O container runtime. @@ -20,3 +27,6 @@ minikube start --driver=podman --container-runtime=cri-o ``` {{% readfile file="/docs/drivers/includes/podman_usage.inc" %}} + +## Known Issues +- Podman driver is not supported on non-amd64 architectures such as arm yet. For non-amd64 archs please use [other drivers]({{< ref "/docs/drivers/" >}} From 45acf714593c7118cfc988f618020cd6e6e11c33 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Fri, 8 May 2020 19:57:45 -0700 Subject: [PATCH 2/5] lint --- pkg/minikube/registry/drvs/docker/docker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 0b7bd4939a..56b6fcaf08 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -72,7 +72,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { func status() registry.State { docURL := "https://minikube.sigs.k8s.io/docs/drivers/docker/" if runtime.GOARCH != "amd64" { - return registry.State{Error: fmt.Errorf("doker driver is not supported on %q systems yet",runtime.GOARCH ), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} + return registry.State{Error: fmt.Errorf("doker driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} } _, err := exec.LookPath(oci.Docker) From 5a4d3279be54315c3c52e02ac4d9ac6ed2a78a57 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 11 May 2020 12:28:48 -0700 Subject: [PATCH 3/5] address review comments --- pkg/minikube/registry/drvs/docker/docker.go | 2 +- site/content/en/docs/drivers/podman.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/minikube/registry/drvs/docker/docker.go b/pkg/minikube/registry/drvs/docker/docker.go index 56b6fcaf08..dbd6b1f981 100644 --- a/pkg/minikube/registry/drvs/docker/docker.go +++ b/pkg/minikube/registry/drvs/docker/docker.go @@ -72,7 +72,7 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) { func status() registry.State { docURL := "https://minikube.sigs.k8s.io/docs/drivers/docker/" if runtime.GOARCH != "amd64" { - return registry.State{Error: fmt.Errorf("doker driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} + return registry.State{Error: fmt.Errorf("docker driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL} } _, err := exec.LookPath(oci.Docker) diff --git a/site/content/en/docs/drivers/podman.md b/site/content/en/docs/drivers/podman.md index 8e60cd2b58..4e3524d07b 100644 --- a/site/content/en/docs/drivers/podman.md +++ b/site/content/en/docs/drivers/podman.md @@ -17,7 +17,7 @@ The podman driver is another kubernetes in container driver for minikube. simila ## Requirements - amd64 system -- Latest version of [Podman](https://podman.io/getting-started/installation) +- Install [Podman](https://podman.io/getting-started/installation) ## Try it with CRI-O container runtime. From be221be8068925b84ef0dd1d791f789b452aff08 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 11 May 2020 12:29:07 -0700 Subject: [PATCH 4/5] address review comments --- site/content/en/docs/drivers/podman.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/site/content/en/docs/drivers/podman.md b/site/content/en/docs/drivers/podman.md index 4e3524d07b..463b572e43 100644 --- a/site/content/en/docs/drivers/podman.md +++ b/site/content/en/docs/drivers/podman.md @@ -13,13 +13,11 @@ This driver is experimental and in active development. Help wanted! The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is experimental, and only supported on Linux and macOS (with a remote podman server). - - ## Requirements + - amd64 system - Install [Podman](https://podman.io/getting-started/installation) - ## Try it with CRI-O container runtime. ```shell From 7c912719f1c3057720c75e49e3c59a6ea561cb64 Mon Sep 17 00:00:00 2001 From: Medya Gh Date: Mon, 11 May 2020 12:29:36 -0700 Subject: [PATCH 5/5] match docker style in podman md --- site/content/en/docs/drivers/podman.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/docs/drivers/podman.md b/site/content/en/docs/drivers/podman.md index 463b572e43..d1e690c8a8 100644 --- a/site/content/en/docs/drivers/podman.md +++ b/site/content/en/docs/drivers/podman.md @@ -15,8 +15,8 @@ The podman driver is another kubernetes in container driver for minikube. simila ## Requirements -- amd64 system - Install [Podman](https://podman.io/getting-started/installation) +- amd64 system ## Try it with CRI-O container runtime.