Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 40 additions & 20 deletions .github/workflows/kubernator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
- '3.11'
- '3.10'
- '3.9'
# include:
# - os: macos-13
# python-version: '3.13'
include:
- os: macos-15-intel
python-version: '3.14'
env:
DEPLOY_PYTHONS: "3.13"
DEPLOY_OSES: "Linux"
Expand Down Expand Up @@ -61,23 +61,6 @@ jobs:
# brew install hyperkit
# hyperkit -v

- name: Install Docker on MacOS
if: |
runner.os == 'macOS'

shell: bash
run: |
set -x
brew update
brew install docker colima

colima version
colima start --cpu 3 --memory 8 --disk 7
sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock

while ! docker info > /dev/null 2>&1; do sleep 1 ; done
docker info

- name: Aggressive cleanup
run: |
# Remove Java (JDKs)
Expand Down Expand Up @@ -117,6 +100,43 @@ jobs:
docker builder prune -af || true
df -h

# - name: Install Docker on MacOS
# if: |
# runner.os == 'macOS'
#
# shell: bash
# run: |
# set -x
# brew update
# brew install docker colima
#
# colima version
# CPU_COUNT=$(sysctl -n hw.ncpu)
# MEMORY=$(sysctl hw.memsize | awk '{print $2/1024/1024/1024}')
# COLIMA_ARGS="--cpu $CPU_COUNT --memory $MEMORY --arch x86_64 --vm-type=vz --mount-type=virtiofs"
# colima start $COLIMA_ARGS
# sudo ln -sf $HOME/.colima/default/docker.sock /var/run/docker.sock
#
# while ! docker info > /dev/null 2>&1; do sleep 1 ; done
# which docker
# docker info

- name: Setup Docker on macOS
if: |
runner.os == 'macOS'

id: setup-docker
uses: douglascamata/setup-docker-macos-action@main

- name: Docker PATH
if: |
runner.os == 'macOS'

run: |
echo /usr/local/bin >> $GITHUB_PATH
echo /usr/local/sbin >> $GITHUB_PATH
which docker

- name: Should Upload
if: |
github.event_name == 'push' &&
Expand Down
2 changes: 2 additions & 0 deletions src/main/python/kubernator/plugins/minikube.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import os
import tempfile
from pathlib import Path
from shutil import which

from kubernator.api import (KubernatorPlugin,
StripNL,
Expand Down Expand Up @@ -138,6 +139,7 @@ def register(self, minikube_version=None, profile="default", k8s_version=None,
self.kubeconfig_dir.mkdir(parents=True, exist_ok=True)

if not driver:
logger.warning(f"PATH: {os.environ['PATH']}, which docker {which('docker')}")
driver = "docker"
if get_golang_os() == "darwin":
logger.debug("Auto-detecting Minikube driver on MacOS...")
Expand Down
Loading