Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change podman priority to default on Linux #10458

Merged
merged 1 commit into from
Mar 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pkg/minikube/registry/drvs/podman/podman.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,19 @@ import (
"k8s.io/minikube/pkg/minikube/registry"
)

var docURL = "https://minikube.sigs.k8s.io/docs/drivers/podman/"

// minReqPodmanVer is required the minimum version of podman to be installed for podman driver.
var minReqPodmanVer = semver.Version{Major: 1, Minor: 7, Patch: 0}
var minReqPodmanVer = semver.Version{Major: 2, Minor: 1, Patch: 0}

func init() {
priority := registry.Experimental
priority := registry.Default
medyagh marked this conversation as resolved.
Show resolved Hide resolved
if runtime.GOOS != "linux" {
// requires external VM set up
priority = registry.Experimental
}
// Staged rollout for default:
// - Linux
// - Linux (sudo podman)
// - macOS (podman-remote)
// - Windows (podman-remote)

Expand Down Expand Up @@ -92,11 +98,6 @@ 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}
Expand Down
8 changes: 1 addition & 7 deletions site/content/en/docs/drivers/podman.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,17 @@ aliases:

## Overview

{{% pageinfo %}}
This driver is experimental and in active development. Help wanted!
{{% /pageinfo %}}

The podman driver is an alternative container runtime to the [Docker]({{< ref "/docs/drivers/docker.md" >}}) driver.

## Requirements

- Linux or macOS operating systems on amd64 architecture
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This "or macOS" was left since before, but the (wrong) code was removed in d0260cc

- Linux operating system
- Install [podman](https://podman.io/getting-started/installation.html)

{{% 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/_index.md" >}})
- Podman v2 driver is not supported yet.
- Podman requirements passwordless running of sudo. If you run into an error about sudo, do the following:

```shell
Expand Down