From a8ca32e63b1475c916e9dd9676e71c035074476c Mon Sep 17 00:00:00 2001 From: Sharif Elgamal Date: Wed, 8 Dec 2021 11:36:56 -0800 Subject: [PATCH] filter out podman for powerpc arch --- deploy/kicbase/Dockerfile | 5 +++-- pkg/minikube/driver/driver_darwin.go | 13 +++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index 740a6ae36c..081f7499aa 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -176,7 +176,8 @@ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/ clean-install cri-o cri-o-runc; fi # install podman -RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \ +RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') && \ + if [ "$ARCH" != "ppc64le" ]; then sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_20.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list" && \ curl -LO https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_20.04/Release.key && \ apt-key add - < Release.key && \ clean-install podman && \ @@ -186,7 +187,7 @@ RUN sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/lib > /etc/systemd/system/podman.socket.d/override.conf && \ mkdir -p /etc/tmpfiles.d && \ echo "d /run/podman 0770 root podman" > /etc/tmpfiles.d/podman.conf && \ - systemd-tmpfiles --create + systemd-tmpfiles --create; fi # automount service COPY deploy/kicbase/automount/minikube-automount /usr/sbin/minikube-automount diff --git a/pkg/minikube/driver/driver_darwin.go b/pkg/minikube/driver/driver_darwin.go index 9153e9e79d..195f9841c0 100644 --- a/pkg/minikube/driver/driver_darwin.go +++ b/pkg/minikube/driver/driver_darwin.go @@ -19,6 +19,7 @@ package driver import ( "os/exec" "runtime" + "strings" ) // supportedDrivers is a list of supported drivers on Darwin. @@ -31,6 +32,18 @@ var supportedDrivers = func() []string { SSH, } } + // PowerPC does not support podman + if strings.HasPrefix(runtime.GOARCH, "ppc") { + return []string{ + VirtualBox, + Parallels, + VMwareFusion, + HyperKit, + VMware, + Docker, + SSH, + } + } return []string{ VirtualBox, Parallels,