Merge pull request #21677 from medyagh/macos15-intel

ci: bump macos from 13 to 15 on github actions

Author: medyagh

.github/workflows/functional_test.yml

@@ -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:
@@ -258,17 +258,8 @@ 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
-          fw=/usr/libexec/ApplicationFirewall/socketfilterfw
-          sudo $fw --remove /usr/libexec/bootpd
-          sudo $fw --add /usr/libexec/bootpd
-          sudo $fw --unblock /usr/libexec/bootpd
       - name: Update brew package index (macos)
-        if: runner.os == 'macOS'
+        if: contains(matrix.os, 'macos')
         run: brew update
       - name: Update apt-get package index (ubuntu)
         if: runner.os == 'Linux' && (matrix.driver == 'podman' || matrix.driver == 'none')
@@ -369,12 +360,12 @@ jobs:
           fi
           kubectl version --client=true
       - name: Install qemu and socket_vmnet (macos)
-        if: matrix.os == 'macos-13' && matrix.driver == 'qemu'
+        if: contains(matrix.os, 'macos') && matrix.driver == 'qemu'
         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.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

.github/workflows/smoke-test.yml

@@ -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
@@ -94,7 +94,7 @@ jobs:
       - name: Build Binaries
         run: make
       - name: Ensure bootpd is enabled (macos)
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         shell: bash
         run: |
           set -x
@@ -103,18 +103,18 @@ jobs:
           sudo $fw --add /usr/libexec/bootpd
           sudo $fw --unblock /usr/libexec/bootpd
       - name: Update brew (macos)
-        if: matrix.os == 'macos-13'
+        if: contains(matrix.os, 'macos')
         run: brew update
       - name: Install tools (macos)
-        if: matrix.os == 'macos-13'
+        if: contains(matrix.os, 'macos')
         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: contains(matrix.os, 'macos') && matrix.driver == 'qemu'
         run: |
           brew install qemu socket_vmnet
           HOMEBREW=$(which brew) && sudo ${HOMEBREW} services start socket_vmnet

pkg/minikube/bootstrapper/certs.go

@@ -28,7 +28,7 @@ import (
 	"strings"
 	"time"
 
-	// WARNING: use path for kic/iso and path/filepath for user os
+	// WARNING: use path for kic/iso and path/filepath for user os paths
 	"path"
 	"path/filepath"