Skip to content
Closed
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
14 changes: 6 additions & 8 deletions .github/workflows/functional_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ jobs:
cruntime: docker
os: ubuntu-22.04
test-timeout: 7m
- name: qemu-docker-macos-13-x86_64
- name: qemu-docker-macos-15-x86_64
driver: qemu
cruntime: docker
os: macos-13
os: macos-15-intel
extra-start-args: --network socket_vmnet
test-timeout: 50m
- name: vfkit-docker-macos-13-x86_64
- name: vfkit-docker-macos-15-x86_64
driver: vfkit
cruntime: docker
os: macos-13
os: macos-15-intel
extra-start-args: --network vmnet-shared
test-timeout: 50m
steps:
Expand Down Expand Up @@ -258,8 +258,6 @@ jobs:
curl https://get.docker.com | sudo sh
dockerd-rootless-setuptool.sh install -f
docker context use rootless
- name: Ensure bootpd is enabled (macos-13)
if: matrix.os == 'macos-13'
shell: bash
run: |
set -x
Expand Down Expand Up @@ -369,12 +367,12 @@ jobs:
fi
kubectl version --client=true
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: matrix.os == 'macos-15' && matrix.driver == 'qemu'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macos-15-intel

run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
- name: Install vfkit and vmnet_helper (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'vfkit'
if: matrix.os == 'macos-15' && matrix.driver == 'vfkit'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

macos-15-intel

run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/smoke-test.yml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Match the changes to functional tests in this file, replacing macos-13 with macos-15-intel and removing bootpd step.

Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
matrix:
include:
- driver: qemu
os: macos-13
os: macos-15-intel
network_flag: --network socket_vmnet
- driver: vfkit
os: macos-13
os: macos-15-intel
network_flag: --network vmnet-shared
- driver: docker
os: ubuntu-24.04
Expand Down Expand Up @@ -93,8 +93,6 @@ jobs:
run: go mod download
- name: Build Binaries
run: make
- name: Ensure bootpd is enabled (macos)
if: matrix.os == 'macos-13'
shell: bash
run: |
set -x
Expand All @@ -103,18 +101,18 @@ jobs:
sudo $fw --add /usr/libexec/bootpd
sudo $fw --unblock /usr/libexec/bootpd
- name: Update brew (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15'
run: brew update
- name: Install tools (macos)
if: matrix.os == 'macos-13'
if: matrix.os == 'macos-15'
run: brew install tree
- name: Install vfkit and vmnet-helper (macos)
if: matrix.driver == 'vfkit'
run: |
brew install vfkit
curl -fsSL https://github.com/minikube-machine/vmnet-helper/releases/latest/download/install.sh | sudo VMNET_INTERACTIVE=0 bash
- name: Install qemu and socket_vmnet (macos)
if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
if: matrix.os == 'macos-15' && matrix.driver == 'qemu'
run: |
brew install qemu socket_vmnet
HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet
Expand Down
6 changes: 3 additions & 3 deletions cmd/minikube/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
klog.Errorf("Error autoSetOptions : %v", err)
}

virtualBoxMacOS13PlusWarning(driverName)
virtualBoxMacOS14PlusWarning(driverName)
hyperkitDeprecationWarning(driverName)
validateFlags(cmd, driverName)
validateUser(driverName)
Expand Down Expand Up @@ -407,8 +407,8 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
}, nil
}

func virtualBoxMacOS13PlusWarning(driverName string) {
if !driver.IsVirtualBox(driverName) || !detect.MacOS13Plus() {
func virtualBoxMacOS14PlusWarning(driverName string) {
if !driver.IsVirtualBox(driverName) || !detect.MacOS14Plus() {
return
}
out.WarningT(`Due to changes in macOS 13+ minikube doesn't currently support VirtualBox. You can use alternative drivers such as 'vfkit', 'qemu', or 'docker'.
Expand Down
6 changes: 3 additions & 3 deletions pkg/minikube/detect/detect.go
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ func CgroupDriver() string {
}
}

// MacOS13Plus returns if the current machine is running macOS 13+
func MacOS13Plus() bool {
// MacOS14Plus returns if the current machine is running macOS 14+
func MacOS14Plus() bool {
if runtime.GOOS != "darwin" {
return false
}
Expand All @@ -210,7 +210,7 @@ func MacOS13Plus() bool {
klog.Warningf("failed to convert macOS version to int: %v", err)
return false
}
return major >= 13
return major >= 14
}

// NestedVM returns true if the current machine is running a nested VM (like in MacOs in Github Action)
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/drivers/krunkit.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ workloads.
## Requirements

- Available only on Apple silicon.
- Requires macOS 13 or later.
- Requires macos 14 or later.
- Requires minikube version 1.37.0 or later.
- Requires krunkit version 1.0.0 or later.
- Requires [vmnet-helper](https://github.com/nirs/vmnet-helper).
Expand Down
2 changes: 1 addition & 1 deletion site/content/en/docs/drivers/vfkit.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ container deployment.

## Requirements

- Requires macOS 13 or later.
- Requires macos 14 or later.
- Requires minikube version 1.36.0 or later.

## Networking
Expand Down