Skip to content

Commit fb90e7e

Browse files
committed
Change podman priority to default on Linux
Requires Podman 2.1 or greater (such as 3.0) Podman is *not* yet supported for Mac or Win.
1 parent 350f8a2 commit fb90e7e

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

pkg/minikube/registry/drvs/podman/podman.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,19 @@ import (
3838
"k8s.io/minikube/pkg/minikube/registry"
3939
)
4040

41+
var docURL = "https://minikube.sigs.k8s.io/docs/drivers/podman/"
42+
4143
// minReqPodmanVer is required the minimum version of podman to be installed for podman driver.
42-
var minReqPodmanVer = semver.Version{Major: 1, Minor: 7, Patch: 0}
44+
var minReqPodmanVer = semver.Version{Major: 2, Minor: 1, Patch: 0}
4345

4446
func init() {
45-
priority := registry.Experimental
47+
priority := registry.Default
48+
if runtime.GOOS != "linux" {
49+
// requires external VM set up
50+
priority = registry.Experimental
51+
}
4652
// Staged rollout for default:
47-
// - Linux
53+
// - Linux (sudo podman)
4854
// - macOS (podman-remote)
4955
// - Windows (podman-remote)
5056

@@ -92,11 +98,6 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
9298
}
9399

94100
func status() registry.State {
95-
docURL := "https://minikube.sigs.k8s.io/docs/drivers/podman/"
96-
if runtime.GOARCH != "amd64" {
97-
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}
98-
}
99-
100101
podman, err := exec.LookPath(oci.Podman)
101102
if err != nil {
102103
return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Podman", Doc: docURL}

site/content/en/docs/drivers/podman.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@ aliases:
77

88
## Overview
99

10-
{{% pageinfo %}}
11-
This driver is experimental and in active development. Help wanted!
12-
{{% /pageinfo %}}
13-
1410
The podman driver is an alternative container runtime to the [Docker]({{< ref "/docs/drivers/docker.md" >}}) driver.
1511

1612
## Requirements
1713

18-
- Linux or macOS operating systems on amd64 architecture
14+
- Linux operating system
1915
- Install [podman](https://podman.io/getting-started/installation.html)
2016

2117
{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
2218

2319
## Known Issues
2420

25-
- Podman driver is not supported on non-amd64 architectures such as arm yet. For non-amd64 archs please use [other drivers]({{< ref "/docs/drivers/_index.md" >}})
26-
- Podman v2 driver is not supported yet.
2721
- Podman requirements passwordless running of sudo. If you run into an error about sudo, do the following:
2822

2923
```shell

0 commit comments

Comments
 (0)