Merge pull request #795 from Kuadrant/podman-fixes

Podman fixes

hack/.binEnv

@@ -9,4 +9,4 @@ export HELM_BIN="${BIN_DIR}helm"
 export YQ_BIN="${BIN_DIR}yq"
 export OPERATOR_SDK_BIN="${BIN_DIR}operator-sdk"
 export CLUSTERADM_BIN="${BIN_DIR}clusteradm"
-export KFILT="docker run --rm -i ryane/kfilt"
+export KFILT="$CONTAINER_RUNTIME_BIN run --rm -i ryane/kfilt"

hack/.cleanupUtils

@@ -12,7 +12,7 @@ cleanClusters() {
 cleanNetwork() {
   # Delete the network
   echo "Deleting mgc network"
-  docker network rm mgc || true
+  $CONTAINER_RUNTIME_BIN network rm mgc || true
 }
 
 cleanupKind() {

hack/.kindUtils

@@ -58,7 +58,8 @@ kindSetupMGCClusters() {
     local dataPlaneClusterCount=$5
 
     # Create network for the clusters
-    docker network create -d bridge --subnet 172.31.0.0/16 ${KIND_CLUSTER_DOCKER_NETWORK} --gateway 172.31.0.1 \
+    # TODO: podman equivs of these options?
+    $CONTAINER_RUNTIME_BIN network create -d bridge --subnet 172.31.0.0/16 ${KIND_CLUSTER_DOCKER_NETWORK} --gateway 172.31.0.1 \
       -o "com.docker.network.bridge.enable_ip_masquerade"="true" \
       -o "com.docker.network.driver.mtu"="1500"
 

hack/.quickstartEnv

@@ -1,14 +1,31 @@
 # shellcheck shell=bash
 
 export TOOLS_IMAGE=quay.io/kuadrant/mgc-tools:latest
-export TMP_DIR=/tmp/mgc
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+export TMP_DIR=$SCRIPT_DIR/tmp/mgc
+
+containerRuntime() {
+  local container_runtime=""
+  if command -v podman &> /dev/null; then
+    container_runtime="podman"
+  elif command -v docker &> /dev/null; then
+    container_runtime="docker"
+  else
+    echo "Neither Docker nor Podman is installed. Exiting..."
+    exit 1
+  fi
+  echo "$container_runtime"
+}
+
+export CONTAINER_RUNTIME_BIN=$(containerRuntime)
 
 dockerBinCmd() {
   local network=""
-  if [ ! -z ${KIND_CLUSTER_DOCKER_NETWORK} ]; then
+  if [ ! -z "${KIND_CLUSTER_DOCKER_NETWORK}" ]; then
     network=" --network ${KIND_CLUSTER_DOCKER_NETWORK}"
   fi
-  echo "docker run --rm -u $UID -v ${TMP_DIR}:/tmp/mgc:z${network} -e KUBECONFIG=/tmp/mgc/kubeconfig --entrypoint=$1 $TOOLS_IMAGE"
+
+  echo "$CONTAINER_RUNTIME_BIN run --rm -u $UID -v ${TMP_DIR}:${TMP_DIR}${network} -e KUBECONFIG=${TMP_DIR}/kubeconfig --entrypoint=$1 $TOOLS_IMAGE"
 }
 
 export KIND_BIN=kind

hack/quickstart-metrics.sh

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-export KFILT="docker run --rm -i ryane/kfilt"
+export KFILT="$CONTAINER_RUNTIME_BIN run --rm -i ryane/kfilt"
 
 METRICS_FEDERATION=true