Skip to content

Commit

Permalink
Merge pull request #19730 from afbjorklund/nerdctld-arch
Browse files Browse the repository at this point in the history
No more arch restriction on nerdctld
  • Loading branch information
spowelljr authored Sep 30, 2024
2 parents 2a3e31b + 6b0d3c6 commit 83f9d2a
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions cmd/minikube/cmd/docker-env.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"net/url"
"os"
"os/exec"
"runtime"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -309,7 +308,6 @@ docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/doc
exit.Message(reason.EnvMultiConflict, `The docker-env command is incompatible with multi-node clusters. Use the 'registry' add-on: https://minikube.sigs.k8s.io/docs/handbook/registry/`)
}
cr := co.Config.KubernetesConfig.ContainerRuntime
// nerdctld supports amd64 and arm64
if err := dockerEnvSupported(cr, driverName); err != nil {
exit.Message(reason.Usage, err.Error())
}
Expand Down Expand Up @@ -674,9 +672,6 @@ func tryDockerConnectivity(bin string, ec DockerEnvConfig) ([]byte, error) {
}

func dockerEnvSupported(containerRuntime, driverName string) error {
if runtime.GOARCH != "amd64" && runtime.GOARCH != "arm64" {
return fmt.Errorf("the docker-env command only supports amd64 & arm64 architectures")
}
if containerRuntime != constants.Docker && containerRuntime != constants.Containerd {
return fmt.Errorf("the docker-env command only supports the docker and containerd runtimes")
}
Expand Down

0 comments on commit 83f9d2a

Please sign in to comment.