From 4482f9856529d2b6833ce2a3fd6da8a888d825a8 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 7 Oct 2022 17:50:27 +0200 Subject: [PATCH] ci: add support for VM_DRIVER=podman to script/minikube.sh When running on AWE EC2 virtual-machines, we'll use Podman instead of installing a VM. The "none" driver might work as well, but it requires additional dependencies to be installed, which may change over time with new minikube or Kubernetes releases. Hopefully the Podman driver is less affected with changes in dependencies. Depends-on: #3419 Closes: #3415 Signed-off-by: Niels de Vos --- scripts/minikube.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/minikube.sh b/scripts/minikube.sh index b73faf05499e..82954128af8f 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -22,7 +22,7 @@ function copy_image_to_cluster() { if [ -z "$(${CONTAINER_CMD} images -q "${build_image}")" ]; then ${CONTAINER_CMD} pull "${build_image}" fi - if [[ "${VM_DRIVER}" == "none" ]]; then + if [[ "${VM_DRIVER}" == "none" ]] || [[ "${VM_DRIVER}" == "podman" ]]; then ${CONTAINER_CMD} tag "${build_image}" "${final_image}" return fi @@ -185,7 +185,7 @@ K8S_FEATURE_GATES=${K8S_FEATURE_GATES:-""} # kubelet.resolv-conf needs to point to a file, not a symlink # the default minikube VM has /etc/resolv.conf -> /run/systemd/resolve/resolv.conf RESOLV_CONF='/run/systemd/resolve/resolv.conf' -if [[ "${VM_DRIVER}" == "none" ]] && [[ ! -e "${RESOLV_CONF}" ]]; then +if ( [[ "${VM_DRIVER}" == "none" ]] || [[ "${VM_DRIVER}" == "podman" ]] ) && [[ ! -e "${RESOLV_CONF}" ]]; then # in case /run/systemd/resolve/resolv.conf does not exist, use the # standard /etc/resolv.conf (with symlink resolved) RESOLV_CONF="$(readlink -f /etc/resolv.conf)" @@ -234,7 +234,7 @@ up) # create a link so the default dataDirHostPath will work for this # environment - if [[ "${VM_DRIVER}" != "none" ]]; then + if [[ "${VM_DRIVER}" != "none" ]] && [[ "${VM_DRIVER}" != "podman" ]]; then wait_for_ssh # shellcheck disable=SC2086 ${minikube} ssh "sudo mkdir -p /mnt/${DISK}/var/lib/rook;sudo ln -s /mnt/${DISK}/var/lib/rook /var/lib/rook"