Merge pull request #11684 from ashley-cui/m1

[3.3] Enable M1 support

cmd/podman/machine/init.go

@@ -20,7 +20,6 @@ var (
 		Args:              cobra.MaximumNArgs(1),
 		Example:           `podman machine init myvm`,
 		ValidArgsFunction: completion.AutocompleteNone,
-		PreRunE:           noAarch64,
 	}
 )
 

cmd/podman/machine/list.go

@@ -30,7 +30,6 @@ var (
 		ValidArgsFunction: completion.AutocompleteNone,
 		Example: `podman machine list,
   podman machine ls`,
-		PreRunE: noAarch64,
 	}
 	listFlag = listFlagType{}
 )

cmd/podman/machine/machine.go

@@ -3,8 +3,6 @@
 package machine
 
 import (
-	"errors"
-	"runtime"
 	"strings"
 
 	"github.com/containers/podman/v3/cmd/podman/registry"
@@ -18,18 +16,6 @@ var (
 	noOp = func(cmd *cobra.Command, args []string) error {
 		return nil
 	}
-	// noAarch64 temporarily disables arm64 support on
-	// Apple Silicon
-	noAarch64 = func(cmd *cobra.Command, args []string) error {
-		if runtime.GOARCH == "arm64" {
-			if runtime.GOOS == "darwin" {
-				return errors.New("due to missing upstream patches, Apple Silicon is not capable of running Podman machine yet")
-			}
-			return errors.New("no aarch64 images are available at this time")
-		}
-		return nil
-	}
-
 	// Command: podman _machine_
 	machineCmd = &cobra.Command{
 		Use:                "machine",

cmd/podman/machine/rm.go

@@ -23,7 +23,6 @@ var (
 		Args:              cobra.MaximumNArgs(1),
 		Example:           `podman machine rm myvm`,
 		ValidArgsFunction: autocompleteMachine,
-		PreRunE:           noAarch64,
 	}
 )
 

cmd/podman/machine/ssh.go

@@ -19,7 +19,6 @@ var (
 		Example: `podman machine ssh myvm
   podman machine ssh myvm echo hello`,
 		ValidArgsFunction: autocompleteMachineSSH,
-		PreRunE:           noAarch64,
 	}
 )
 

cmd/podman/machine/start.go

@@ -19,7 +19,6 @@ var (
 		Args:              cobra.MaximumNArgs(1),
 		Example:           `podman machine start myvm`,
 		ValidArgsFunction: autocompleteMachine,
-		PreRunE:           noAarch64,
 	}
 )
 

cmd/podman/machine/stop.go

@@ -18,7 +18,6 @@ var (
 		Args:              cobra.MaximumNArgs(1),
 		Example:           `podman machine stop myvm`,
 		ValidArgsFunction: autocompleteMachine,
-		PreRunE:           noAarch64,
 	}
 )