Merge branch 'master' into refactorGUI

2022-05-18 14:28:43 -07:00 · 2022-05-18 14:28:43 -07:00 · c36b9aded9
parent 8a38cf5ce6 cd766f1ed7
commit c36b9aded9
307 changed files with 8444 additions and 635 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -12,7 +12,7 @@ on:
      - "!deploy/iso/**"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -21,7 +21,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -48,7 +48,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -67,7 +67,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -6,7 +6,7 @@ on:
      - master  
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -29,7 +29,7 @@ jobs:
          echo "::set-output name=changes::$c"
      - name: Create PR
        if: ${{ steps.gendocs.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: Update auto-generated docs and translations
--- a/.github/workflows/functional_verified.yml
+++ b/.github/workflows/functional_verified.yml
@ -8,6 +8,7 @@ on:
      - "**.yml"
      - "**.yaml"
      - "Makefile"
+      - "**Dockerfile**"
      - "!deploy/kicbase/**"
      - "!deploy/iso/**"
    types:
@ -21,7 +22,7 @@ on:
      - deleted
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'

 permissions:
  contents: read
@ -34,7 +35,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -114,8 +115,7 @@ jobs:
          echo "--------------------------"
          hostname || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/leaderboard.yml
+++ b/.github/workflows/leaderboard.yml
@ -7,7 +7,7 @@ on:
  release:
    types: [published]
 env:
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -32,7 +32,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.MINIKUBE_BOT_PAT }}
      - name: Create PR
        if: ${{ steps.leaderboard.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: Update leaderboard
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -14,7 +14,7 @@ on:
      - "!deploy/iso/**"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -52,7 +52,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -71,7 +71,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -119,8 +119,7 @@ jobs:
          echo "--------------------------"
          docker ps || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -220,8 +219,7 @@ jobs:
          echo "--------------------------"
          docker ps || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -325,8 +323,7 @@ jobs:
        echo "--------------------------"
        podman ps || true
        echo "--------------------------"
-    # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-    - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+    - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
      with:
        go-version: ${{env.GO_VERSION}}
        stable: true
@ -412,8 +409,7 @@ jobs:
          curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl
          sudo install kubectl /usr/local/bin/kubectl
          kubectl version --client=true
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -523,8 +519,7 @@ jobs:
          VERSION="v1.17.0"
          curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz
          sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -12,7 +12,7 @@ on:
      - "!deploy/iso/**"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -23,7 +23,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -50,7 +50,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -69,7 +69,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -117,8 +117,7 @@ jobs:
          echo "--------------------------"
          docker ps || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -218,8 +217,7 @@ jobs:
          echo "--------------------------"
          docker ps || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -324,8 +322,7 @@ jobs:
          echo "--------------------------"
          podman ps || true
          echo "--------------------------"
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -412,8 +409,7 @@ jobs:
          curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl
          sudo install kubectl /usr/local/bin/kubectl
          kubectl version --client=true
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -524,8 +520,7 @@ jobs:
          VERSION="v1.17.0"
          curl -L https://github.com/kubernetes-sigs/cri-tools/releases/download/$VERSION/crictl-${VERSION}-linux-amd64.tar.gz --output crictl-${VERSION}-linux-amd64.tar.gz
          sudo tar zxvf crictl-$VERSION-linux-amd64.tar.gz -C /usr/local/bin
-      # go 1.14.6+ is needed because of this bug https://github.com/golang/go/issues/39308
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/sync-minikube.yml
+++ b/.github/workflows/sync-minikube.yml
@ -22,7 +22,7 @@ jobs:
        path: ./image-syncer

    - name: Set up Go
-      uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
      with:
        go-version: 1.17

--- a/.github/workflows/time-to-k8s-public-chart.yml
+++ b/.github/workflows/time-to-k8s-public-chart.yml
@ -6,7 +6,7 @@ on:
    - cron: "0 2,14 * * *"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -20,7 +20,7 @@ jobs:
      AWS_DEFAULT_REGION: 'us-west-1'
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -45,7 +45,7 @@ jobs:
          curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/darwin/amd64/kubectl
          sudo install kubectl /usr/local/bin/kubectl
          kubectl version --client=true
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/time-to-k8s.yml
+++ b/.github/workflows/time-to-k8s.yml
@ -5,7 +5,7 @@ on:
    types: [released]
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -16,7 +16,7 @@ jobs:
    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
    - name: Checkout submodules
      run: git submodule update --init
-    - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+    - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
      with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -26,7 +26,7 @@ jobs:
          ./hack/benchmark/time-to-k8s/time-to-k8s.sh
          echo "::set-output name=version::$(minikube version --short)"
    - name: Create PR
-      uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+      uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
      with:
        token: ${{ secrets.MINIKUBE_BOT_PAT }}
        commit-message: add time-to-k8s benchmark for ${{ steps.timeToK8sBenchmark.outputs.version }}
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@ -6,7 +6,7 @@ on:
      - "translations/**"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/twitter-bot.yml
+++ b/.github/workflows/twitter-bot.yml
@ -12,7 +12,7 @@ jobs:
    steps:
      - uses: ethomson/send-tweet-action@288f9339e0412e3038dce350e0da5ecdf12133a6
        with:
-          status: "minikube ${GITHUB_REF_NAME} was just released! Check it out: https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md"
+          status: "minikube ${{github.ref_name}} was just released! Check it out: https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md"
          consumer-key: ${{ secrets.TWITTER_API_KEY }}
          consumer-secret: ${{ secrets.TWITTER_API_SECRET }}
          access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
--- a/.github/workflows/update-golang-version.yml
+++ b/.github/workflows/update-golang-version.yml
@ -6,7 +6,7 @@ on:
    - cron: "0 9 * * 1"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -26,7 +26,7 @@ jobs:
          echo "::set-output name=changes::$(git status --porcelain)"
      - name: Create PR
        if: ${{ steps.bumpGolang.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: bump golang versions
--- a/.github/workflows/update-golint-version.yml
+++ b/.github/workflows/update-golint-version.yml
@ -6,7 +6,7 @@ on:
    - cron: "0 10 * * 1"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -26,7 +26,7 @@ jobs:
          echo "::set-output name=changes::$(git status --porcelain)"
      - name: Create PR
        if: ${{ steps.bumpGolint.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: bump golint versions
--- a/.github/workflows/update-k8s-versions.yml
+++ b/.github/workflows/update-k8s-versions.yml
@ -6,7 +6,7 @@ on:
    - cron: "0 8 * * 1"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,11 +15,10 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
-          stable: true
-      - name: Bump Kuberenetes Versions
+      - name: Bump Kubernetes Versions
        id: bumpk8s
        run: |
          t=$(make update-kubernetes-version)
@ -31,7 +30,7 @@ jobs:
          echo "::set-output name=changes::$c"
      - name: Create PR
        if: ${{ steps.bumpk8s.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: bump default/newest kubernetes versions
--- a/.github/workflows/update-kubadm-constants.yml
+++ b/.github/workflows/update-kubadm-constants.yml
@ -6,7 +6,7 @@ on:
    - cron: "0 6 * * 1"
 env:
  GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.18.1'
+  GO_VERSION: '1.18.2'
 permissions:
  contents: read

@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
+      - uses: actions/setup-go@fcdc43634adb5f7ae75a9d7a9b9361790f7293e2
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -29,7 +29,7 @@ jobs:
          echo "::set-output name=changes::$c"
      - name: Create PR
        if: ${{ steps.bumpKubAdmConsts.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@bd72e1b7922d417764d27d30768117ad7da78a0e
+        uses: peter-evans/create-pull-request@f094b77505fb89581e68a1163fbd2fffece39da1
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: update image constants for kubeadm images
--- a/.gitignore
+++ b/.gitignore
@ -26,14 +26,19 @@ _testmain.go
 *.test
 *.prof

-/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/auto-pause
+/deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/usr/bin/auto-pause
+/deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/usr/bin/auto-pause
+/deploy/iso/minikube-iso/Config.in
 /deploy/kicbase/auto-pause
 /deploy/addons/auto-pause/auto-pause-hook
 /out
 /_gopath

 #iso version file
-deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/VERSION
+deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/etc/VERSION
+deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/etc/VERSION
+deploy/iso/minikube-iso/board/minikube/x86_64/rootfs-overlay/etc/CHANGELOG
+deploy/iso/minikube-iso/board/minikube/aarch64/rootfs-overlay/etc/CHANGELOG

 /minikube

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,136 @@
 # Release Notes

+## Version 1.26.0-beta.1 - 2022-05-17
+
+QEMU driver enhancements:
+* fix qemu firmware path locations [#14182](https://github.com/kubernetes/minikube/pull/14182)
+* re-establish apiserver tunnel on restart  [#14183](https://github.com/kubernetes/minikube/pull/14183)
+
+Features:
+* Add configure option to registry-aliases addon [#13912](https://github.com/kubernetes/minikube/pull/13912)
+
+For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md).
+
+Thank you to our contributors for this release!
+
+- Jack Zhang
+- Pablo Caderno
+- Sharif Elgamal
+- Steven Powell
+- Yuki Okushi
+- loftkun
+
+Thank you to our PR reviewers for this release!
+
+- spowelljr (20 comments)
+- afbjorklund (1 comments)
+- sharifelgamal (1 comments)
+
+Thank you to our triage members for this release!
+
+- afbjorklund (4 comments)
+- spowelljr (4 comments)
+- Al4DIN (1 comments)
+- Gimb0 (1 comments)
+- Neandril (1 comments)
+
+## Version 1.26.0-beta.0 - 2022-05-13
+
+Featues:
+* Add support for the QEMU driver [#13639](https://github.com/kubernetes/minikube/pull/13639)
+* Add support for building aarch64 ISO [#13762](https://github.com/kubernetes/minikube/pull/13762)
+* Support rootless Podman driver (Usage: `minikube config set rootless true`) [#13829](https://github.com/kubernetes/minikube/pull/13829)
+
+Minor Improvements:
+* Add JSON output to `minikube delete` [#13979](https://github.com/kubernetes/minikube/pull/13979)
+* Add `--audit` flag to `minikube logs` command [#13991](https://github.com/kubernetes/minikube/pull/13991)
+* Add `--disable-metrics` flag [#13802](https://github.com/kubernetes/minikube/pull/13802)
+* Get latest valid tag for each image during caching [#14006](https://github.com/kubernetes/minikube/pull/14006)
+* Remove docker requirement for none driver [#13885](https://github.com/kubernetes/minikube/pull/13885)
+* Add 'subnet' flag for docker/podman driver [#13730](https://github.com/kubernetes/minikube/pull/13730)
+* Don't write logs that contain environment variables [#13877](https://github.com/kubernetes/minikube/pull/13877)
+* Implemented minimum and recommended Docker versions [#13842](https://github.com/kubernetes/minikube/pull/13842)
+
+Bug Fixes:
+* Fix "Your cgroup does not allow setting memory" [#14115](https://github.com/kubernetes/minikube/pull/14115)
+* Fix nvidia-gpu with kvm-driver [#13972](https://github.com/kubernetes/minikube/pull/13972)
+* Fix `minikube delete` for Podman v4 [#13881](https://github.com/kubernetes/minikube/pull/13881)
+* Fix pre command flags [#13995](https://github.com/kubernetes/minikube/pull/13995)
+* Fix logging when JSON output selected [#13955](https://github.com/kubernetes/minikube/pull/13955)
+* Fix port validation error on specifying tcp/udp or range of ports. [#13812](https://github.com/kubernetes/minikube/pull/13812)
+* Fix not downloading kic for offline mode [#13910](https://github.com/kubernetes/minikube/pull/13910)
+* Fix trying to pause multiple containers with runc [#13783](https://github.com/kubernetes/minikube/pull/13783)
+* Fix `minikube servce` docker/port-forward issues [#13756](https://github.com/kubernetes/minikube/pull/13756)
+
+Version Upgrades:
+* Upgrade Kubernetes default: v1.23.6 and latest: v1.23.6 [#14144](https://github.com/kubernetes/minikube/pull/14144)
+* ISO/KIC: Upgrade buildkit from 0.9.0 to 0.10.3 [#13791](https://github.com/kubernetes/minikube/pull/13791)
+* ISO: Upgrade Docker from 20.10.12 to 20.10.14 [#13860](https://github.com/kubernetes/minikube/pull/13860)
+* ISO: Upgrade crio from 1.22.1 to 1.22.3 [#13800](https://github.com/kubernetes/minikube/pull/13800)
+* ISO: Upgrade buildroot from 2021.02.4 to 2021.02.12 [#13814](https://github.com/kubernetes/minikube/pull/13814)
+* Upgrade nginx image from 1.1.1 to 1.2.0 [#14028](https://github.com/kubernetes/minikube/pull/14028)
+* ISO: Upgrade falco-module from 0.24.0 to 0.31.1 [#13659](https://github.com/kubernetes/minikube/pull/13659)
+* Upgrade kubernetes dashboard from 2.3.1 to 2.5.1 [#13741](https://github.com/kubernetes/minikube/pull/13741)
+* KIC: Upgrade kicbase base image from 20210401 to 20220316 [#13815](https://github.com/kubernetes/minikube/pull/13815)
+* ISO: Upgrade Podman from 2.2.1 to 3.4.2 [#13126](https://github.com/kubernetes/minikube/pull/13126)
+* ISO: Add packaging for crun [#11679](https://github.com/kubernetes/minikube/pull/11679)
+
+For a more detailed changelog, including changes occuring in pre-release versions, see [CHANGELOG.md](https://github.com/kubernetes/minikube/blob/master/CHANGELOG.md).
+
+Thank you to our contributors for this release!
+
+- Akihiro Suda
+- Akira Yoshiyama
+- Anders F Björklund
+- Ashwin Somasundara
+- Carlos Eduardo Arango Gutierrez
+- Daniel Petri
+- F1ko
+- Filip Nikolic
+- Ileriayo Adebiyi
+- Jeff MAURY
+- Jin Zhang
+- Medya Ghazizadeh
+- Nikhil2001
+- Pablo Caderno
+- Piotr Resztak
+- Predrag Rogic
+- Sean Wei
+- Sharif Elgamal
+- Steven Powell
+- Tomohito YABU
+- Toshiaki Inukai
+- betaboon
+- ckannon
+- edwinwalela
+- klaases
+- naveensrinivasan
+- staticdev
+- ziyi-xie
+
+Thank you to our PR reviewers for this release!
+
+- spowelljr (55 comments)
+- medyagh (39 comments)
+- afbjorklund (14 comments)
+- klaases (14 comments)
+- jesperpedersen (9 comments)
+- sharifelgamal (6 comments)
+- atoato88 (3 comments)
+- jepio (3 comments)
+- mprimeaux (2 comments)
+- shu-mutou (2 comments)
+- t-inu (2 comments)
+- AkihiroSuda (1 comments)
+
+Thank you to our triage members for this release!
+
+- afbjorklund (52 comments)
+- klaases (39 comments)
+- RA489 (28 comments)
+- spowelljr (24 comments)
+- zhan9san (24 comments)
+
 ## Version 1.25.2 - 2022-02-23

 Features:
@ -81,7 +212,7 @@ Thank you to our triage members for this release!
 - klaases (13 comments)
 - sharifelgamal (12 comments)

-Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.25.1/) for this release!
+Check out our [contributions leaderboard](https://minikube.sigs.k8s.io/docs/contrib/leaderboard/v1.25.2/) for this release!

 ## Version 1.25.1 - 2022-01-20

--- a/66
+++ b/66
@ -14,8 +14,8 @@

 # Bump these on release - and please check ISO_VERSION for correctness.
 VERSION_MAJOR ?= 1
-VERSION_MINOR ?= 25
-VERSION_BUILD ?= 2
+VERSION_MINOR ?= 26
+VERSION_BUILD ?= 0-beta.1
 RAW_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 VERSION ?= v$(RAW_VERSION)

@ -23,7 +23,7 @@ KUBERNETES_VERSION ?= $(shell egrep "DefaultKubernetesVersion =" pkg/minikube/co
 KIC_VERSION ?= $(shell egrep "Version =" pkg/drivers/kic/types.go | cut -d \" -f2)

 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.25.2-1650391217-13814
+ISO_VERSION ?= v1.26.0-beta.1
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0
@ -33,9 +33,9 @@ RPM_REVISION ?= 0

 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
 # update this only by running `make update-golang-version`
-GO_VERSION ?= 1.18.1
+GO_VERSION ?= 1.18.2
 # update this only by running `make update-golang-version`
-GO_K8S_VERSION_PREFIX ?= v1.24.0
+GO_K8S_VERSION_PREFIX ?= v1.25.0

 # replace "x.y.0" => "x.y". kube-cross and golang.org/dl use different formats for x.y.0 go versions
 KVM_GO_VERSION ?= $(GO_VERSION:.0=)
@ -76,7 +76,7 @@ MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
 KERNEL_VERSION ?= 4.19.235
 # latest from https://github.com/golangci/golangci-lint/releases 
 # update this only by running `make update-golint-version`
-GOLINT_VERSION ?= v1.45.2
+GOLINT_VERSION ?= v1.46.1
 # Limit number of default jobs, to avoid the CI builds running out of memory
 GOLINT_JOBS ?= 4
 # see https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
@ -93,7 +93,7 @@ GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
 GOARM ?= 7 # the default is 5
 GOPATH ?= $(shell go env GOPATH)
-BUILD_DIR ?= ./out
+BUILD_DIR ?= $(PWD)/out
 $(shell mkdir -p $(BUILD_DIR))
 CURRENT_GIT_BRANCH ?= $(shell git branch | grep \* | cut -d ' ' -f2)

@ -282,17 +282,27 @@ out/e2e-%: out/minikube-%
 out/e2e-windows-amd64.exe: out/e2e-windows-amd64
 	cp $< $@

-minikube_iso: deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/auto-pause # build minikube iso
-	echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/VERSION
+minikube-iso-amd64: minikube-iso-x86_64
+minikube-iso-arm64: minikube-iso-aarch64
+
+minikube-iso-%: deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause # build minikube iso
+	echo $(ISO_VERSION) > deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/VERSION
+	cp deploy/iso/minikube-iso/CHANGELOG deploy/iso/minikube-iso/board/minikube/$*/rootfs-overlay/etc/CHANGELOG
+	cp deploy/iso/minikube-iso/arch/$*/Config.in.tmpl deploy/iso/minikube-iso/Config.in
 	if [ ! -d $(BUILD_DIR)/buildroot ]; then \
 		mkdir -p $(BUILD_DIR); \
 		git clone --depth=1 --branch=$(BUILDROOT_BRANCH) https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot; \
 		cp deploy/iso/minikube-iso/go.hash $(BUILD_DIR)/buildroot/package/go/go.hash; \
 	fi;
-	$(MAKE) BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) host-python
-	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS)
-	mv $(BUILD_DIR)/buildroot/output/images/rootfs.iso9660 $(BUILD_DIR)/minikube.iso
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* minikube_$*_defconfig
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$* host-python
+	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) O=$(BUILD_DIR)/buildroot/output-$*
+	# x86_64 ISO is still BIOS rather than EFI because of AppArmor issues for KVM, and Gen 2 issues for Hyper-V
+	if [ "$*" = "aarch64" ]; then \
+                mv $(BUILD_DIR)/buildroot/output-aarch64/images/boot.iso $(BUILD_DIR)/minikube-arm64.iso; \
+        else \
+                mv $(BUILD_DIR)/buildroot/output-x86_64/images/rootfs.iso9660 $(BUILD_DIR)/minikube-amd64.iso; \
+        fi;

 # Change buildroot configuration for the minikube ISO
 .PHONY: iso-menuconfig
@ -301,15 +311,14 @@ iso-menuconfig: ## Configure buildroot configuration
 	$(MAKE) -C $(BUILD_DIR)/buildroot $(BUILDROOT_OPTIONS) savedefconfig

 # Change the kernel configuration for the minikube ISO
-.PHONY: linux-menuconfig
-linux-menuconfig:  ## Configure Linux kernel configuration
+linux-menuconfig-%:  ## Configure Linux kernel configuration
 	$(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ menuconfig
 	$(MAKE) -C $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/ savedefconfig
-	cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/coreos/minikube/linux_defconfig
+	cp $(BUILD_DIR)/buildroot/output/build/linux-$(KERNEL_VERSION)/defconfig deploy/iso/minikube-iso/board/minikube/$*/linux_$*_defconfig

-out/minikube.iso: $(shell find "deploy/iso/minikube-iso" -type f)
+out/minikube-%.iso: $(shell find "deploy/iso/minikube-iso" -type f)
 ifeq ($(IN_DOCKER),1)
-	$(MAKE) minikube_iso
+	$(MAKE) minikube-iso-$*
 else
 	docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
 		--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
@ -321,9 +330,6 @@ iso_in_docker:
 		--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
 		$(ISO_BUILD_IMAGE) /bin/bash

-test-iso:
-	go test -v $(INTEGRATION_TESTS_TO_RUN) --tags=iso --minikube-start-args="--iso-url=file://$(shell pwd)/out/buildroot/output/images/rootfs.iso9660"
-
 .PHONY: test-pkg
 test-pkg/%: ## Trigger packaging test
 	go test -v -test.timeout=60m ./$* --tags="$(MINIKUBE_BUILD_TAGS)"
@ -436,7 +442,7 @@ e2e-cross: e2e-linux-amd64 e2e-linux-arm64 e2e-darwin-amd64 e2e-windows-amd64.ex

 .PHONY: checksum
 checksum: ## Generate checksums
-	for f in out/minikube.iso out/minikube-linux-amd64 out/minikube-linux-arm \
+	for f in out/minikube-amd64.iso out/minikube-arm64.iso out/minikube-linux-amd64 out/minikube-linux-arm \
 		 out/minikube-linux-arm64 out/minikube-linux-ppc64le out/minikube-linux-s390x \
 		 out/minikube-darwin-amd64 out/minikube-darwin-arm64 out/minikube-windows-amd64.exe \
 		 out/docker-machine-driver-kvm2 out/docker-machine-driver-kvm2-amd64 out/docker-machine-driver-kvm2-arm64 \
@ -521,7 +527,8 @@ mdlint:

 .PHONY: verify-iso
 verify-iso: # Make sure the current ISO exists in the expected bucket
-	gsutil stat gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION).iso
+	gsutil stat gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-amd64.iso
+	gsutil stat gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-arm64.iso

 out/docs/minikube.md: $(shell find "cmd") $(shell find "pkg/minikube/constants")
 	go run -ldflags="$(MINIKUBE_LDFLAGS)" -tags gendocs hack/help_text/gen_help_text.go
@ -776,9 +783,11 @@ push-gvisor-addon-image: gvisor-addon-image
 	$(MAKE) push-docker IMAGE=$(REGISTRY)/gvisor-addon:$(GVISOR_TAG)

 .PHONY: release-iso
-release-iso: minikube_iso checksum  ## Build and release .iso file
-	gsutil cp out/minikube.iso gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION).iso
-	gsutil cp out/minikube.iso.sha256 gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION).iso.sha256
+release-iso: minikube-iso-aarch64 minikube-iso-x86_64 checksum  ## Build and release .iso files
+	gsutil cp out/minikube-amd64.iso gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-amd64.iso
+	gsutil cp out/minikube-amd64.iso.sha256 gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-amd64.iso.sha256
+	gsutil cp out/minikube-arm64.iso gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-arm64.iso
+	gsutil cp out/minikube-arm64.iso.sha256 gs://$(ISO_BUCKET)/minikube-$(ISO_VERSION)-arm64.iso.sha256

 .PHONY: release-minikube
 release-minikube: out/minikube checksum ## Minikube release
@ -918,8 +927,9 @@ out/mkcmp:


 # auto pause binary to be used for ISO
-deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/bin/auto-pause: $(SOURCE_FILES) $(ASSET_FILES)
-	GOOS=linux GOARCH=$(GOARCH) go build -o $@ cmd/auto-pause/auto-pause.go
+deploy/iso/minikube-iso/board/minikube/%/rootfs-overlay/usr/bin/auto-pause: $(SOURCE_FILES) $(ASSET_FILES)
+	@if [ "$*" != "x86_64" ] && [ "$*" != "aarch64" ]; then echo "Please enter a valid architecture. Choices are x86_64 and aarch64."; exit 1; fi
+	GOOS=linux GOARCH=$(subst x86_64,amd64,$(subst aarch64,arm64,$*)) go build -o $@ cmd/auto-pause/auto-pause.go


 .PHONY: deploy/addons/auto-pause/auto-pause-hook
--- a/cmd/minikube/cmd/config/configure.go
+++ b/cmd/minikube/cmd/config/configure.go
@ -23,6 +23,7 @@ import (

 	"github.com/spf13/cobra"
 	"k8s.io/minikube/pkg/addons"
+	"k8s.io/minikube/pkg/minikube/assets"
 	"k8s.io/minikube/pkg/minikube/config"
 	"k8s.io/minikube/pkg/minikube/exit"
 	"k8s.io/minikube/pkg/minikube/mustload"
@ -234,6 +235,26 @@ var addonsConfigureCmd = &cobra.Command{
 			if err := config.SaveProfile(profile, cfg); err != nil {
 				out.ErrT(style.Fatal, "Failed to save config {{.profile}}", out.V{"profile": profile})
 			}
+		case "registry-aliases":
+			profile := ClusterFlagValue()
+			_, cfg := mustload.Partial(profile)
+			validator := func(s string) bool {
+				format := regexp.MustCompile(`^([a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+)+(\ [a-zA-Z0-9-_]+\.[a-zA-Z0-9-_]+)*$`)
+				return format.MatchString(s)
+			}
+			registryAliases := AskForStaticValidatedValue("-- Enter registry aliases separated by space: ", validator)
+			cfg.KubernetesConfig.RegistryAliases = registryAliases
+
+			if err := config.SaveProfile(profile, cfg); err != nil {
+				out.ErrT(style.Fatal, "Failed to save config {{.profile}}", out.V{"profile": profile})
+			}
+			addon := assets.Addons["registry-aliases"]
+			if addon.IsEnabled(cfg) {
+				// Re-enable registry-aliases addon in order to generate template manifest files with custom hosts
+				if err := addons.EnableOrDisableAddon(cfg, "registry-aliases", "true"); err != nil {
+					out.ErrT(style.Fatal, "Failed to configure registry-aliases {{.profile}}", out.V{"profile": profile})
+				}
+			}

 		default:
 			out.FailureT("{{.name}} has no available configuration options", out.V{"name": addon})
--- a/cmd/minikube/cmd/dashboard.go
+++ b/cmd/minikube/cmd/dashboard.go
@ -47,9 +47,9 @@ import (
 var (
 	dashboardURLMode     bool
 	dashboardExposedPort int
-	// Matches: 127.0.0.1:8001
+	// Matches: "127.0.0.1:8001" or "127.0.0.1 40012" etc.
 	// TODO(tstromberg): Get kubectl to implement a stable supported output format.
-	hostPortRe = regexp.MustCompile(`127.0.0.1:\d{4,}`)
+	hostPortRe = regexp.MustCompile(`127.0.0.1(:| )\d{4,}`)
 )

 // dashboardCmd represents the dashboard command
--- a/cmd/minikube/cmd/docker-env.go
+++ b/cmd/minikube/cmd/docker-env.go
@ -38,6 +38,7 @@ import (
 	"k8s.io/klog/v2"

 	"k8s.io/minikube/pkg/drivers/kic/oci"
+	"k8s.io/minikube/pkg/drivers/qemu"
 	"k8s.io/minikube/pkg/minikube/bootstrapper/bsutil/kverify"
 	"k8s.io/minikube/pkg/minikube/command"
 	"k8s.io/minikube/pkg/minikube/constants"
@ -290,11 +291,13 @@ var dockerEnvCmd = &cobra.Command{

 		d := co.CP.Host.Driver
 		port := constants.DockerDaemonPort
-		if driver.NeedsPortForward(driverName) {
+		if driver.NeedsPortForward(driverName) && driver.IsKIC(driverName) {
 			port, err = oci.ForwardedPort(driverName, cname, port)
 			if err != nil {
 				exit.Message(reason.DrvPortForward, "Error getting port binding for '{{.driver_name}} driver: {{.error}}", out.V{"driver_name": driverName, "error": err})
 			}
+		} else if driver.NeedsPortForward(driverName) && driverName == driver.QEMU2 {
+			port = d.(*qemu.Driver).EnginePort
 		}

 		hostname, err := d.GetSSHHostname()
--- a/cmd/minikube/cmd/service.go
+++ b/cmd/minikube/cmd/service.go
@ -85,6 +85,12 @@ var serviceCmd = &cobra.Command{

 		cname := ClusterFlagValue()
 		co := mustload.Healthy(cname)
+
+		// Bail cleanly for qemu2 until implemented
+		if driver.IsQEMU(co.Config.Driver) {
+			exit.Message(reason.Unimplemented, "minikube service is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+		}
+
 		var services service.URLs
 		services, err := service.GetServiceURLs(co.API, co.Config.Name, namespace, serviceURLTemplate)
 		if err != nil {
@ -103,7 +109,7 @@ var serviceCmd = &cobra.Command{
 			services = newServices
 		}

-		if services == nil || len(services) == 0 {
+		if len(services) == 0 {
 			exit.Message(reason.SvcNotFound, `Service '{{.service}}' was not found in '{{.namespace}}' namespace.
 You may select another namespace by using 'minikube service {{.service}} -n <namespace>'. Or list out all the services using 'minikube service list'`, out.V{"service": args[0], "namespace": namespace})
 		}
@ -140,8 +146,10 @@ You may select another namespace by using 'minikube service {{.service}} -n <nam
 			}
 		}

-		if driver.NeedsPortForward(co.Config.Driver) && services != nil {
+		if driver.NeedsPortForward(co.Config.Driver) && driver.IsKIC(co.Config.Driver) && services != nil {
 			startKicServiceTunnel(services, cname, co.Config.Driver)
+		} else if driver.NeedsPortForward(co.Config.Driver) && driver.IsQEMU(co.Config.Driver) && services != nil {
+			startQemuServiceTunnel(services, cname, co.Config.Driver)
 		} else if !serviceURLMode {
 			openURLs(data)
 		}
@ -214,6 +222,9 @@ func startKicServiceTunnel(services service.URLs, configName, driverName string)
 	<-ctrlC
 }

+func startQemuServiceTunnel(services service.URLs, configName, driverName string) {
+}
+
 func mutateURLs(serviceName string, urls []string) ([]string, error) {
 	formattedUrls := make([]string, 0)
 	for _, rawURL := range urls {
--- a/cmd/minikube/cmd/start.go
+++ b/cmd/minikube/cmd/start.go
@ -312,6 +312,11 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
 		return node.Starter{}, errors.Wrap(err, "Failed to generate config")
 	}

+	// Bail cleanly for qemu2 until implemented
+	if driver.IsVM(cc.Driver) && runtime.GOARCH == "arm64" && cc.KubernetesConfig.ContainerRuntime != "docker" {
+		exit.Message(reason.Unimplemented, "arm64 VM drivers do not currently support containerd or crio container runtimes. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+	}
+
 	// This is about as far as we can go without overwriting config files
 	if viper.GetBool(dryRun) {
 		out.Step(style.DryRun, `dry-run validation complete!`)
--- a/cmd/minikube/cmd/tunnel.go
+++ b/cmd/minikube/cmd/tunnel.go
@ -55,6 +55,11 @@ var tunnelCmd = &cobra.Command{
 		cname := ClusterFlagValue()
 		co := mustload.Healthy(cname)

+		// Bail cleanly for qemu2 until implemented
+		if driver.IsQEMU(co.Config.Driver) {
+			exit.Message(reason.Unimplemented, "minikube tunnel is not currently implemented with the qemu2 driver. See https://github.com/kubernetes/minikube/issues/14146 for details.")
+		}
+
 		if cleanup {
 			klog.Info("Checking for tunnels to cleanup...")
 			if err := manager.CleanupNotRunningTunnels(); err != nil {
@ -79,8 +84,7 @@ var tunnelCmd = &cobra.Command{
 			cancel()
 		}()

-		if driver.NeedsPortForward(co.Config.Driver) {
-
+		if driver.NeedsPortForward(co.Config.Driver) && driver.IsKIC(co.Config.Driver) {
 			port, err := oci.ForwardedPort(co.Config.Driver, cname, 22)
 			if err != nil {
 				exit.Error(reason.DrvPortForward, "error getting ssh port", err)
--- a/deploy/addons/registry-aliases/registry-aliases-config.tmpl
+++ b/deploy/addons/registry-aliases/registry-aliases-config.tmpl
@ -9,11 +9,14 @@ metadata:
 data:
  # Add additional hosts separated by new-line
  registryAliases: >-
+   {{- if .RegistryAliases}}
+   {{ .RegistryAliases}}
+   {{- else}}
    example.org
    example.com
    test.com
    test.org
+   {{- end}}
    registry.minikube
  # default registry address in minikube when enabled via minikube addons enable registry
-  registrySvc: registry.kube-system.svc.cluster.local
-
+  registrySvc: registry.kube-system.svc.cluster.local
--- a/deploy/iso/minikube-iso/Config.in
+++ b/deploy/iso/minikube-iso/Config.in
@ -1 +0,0 @@
-source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
--- a/deploy/iso/minikube-iso/arch/aarch64/Config.in.tmpl
+++ b/deploy/iso/minikube-iso/arch/aarch64/Config.in.tmpl
@ -0,0 +1,2 @@
+source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/Config.in" 
--- a/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/Config.in
@ -0,0 +1,12 @@
+menu "System tools aarch64"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/buildkit-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/runc-master-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crio-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/crictl-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/docker-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cri-dockerd-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/cni-plugins-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/containerd-bin-aarch64/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/aarch64/package/podman-aarch64/Config.in"
+endmenu
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/51-buildkit.preset
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/51-buildkit.preset
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/Config.in
@ -0,0 +1,4 @@
+config BR2_PACKAGE_BUILDKIT_BIN_AARCH64
+	bool "buildkit-bin"
+	default y
+	depends on BR2_aarch64
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.hash
@ -0,0 +1,2 @@
+sha256 0a834a749e86525e0eb16e7e80ce726e7c6a8e8d26fc5cc36c712305024da4e7  buildkit-v0.9.0.linux-arm64.tar.gz
+sha256 27e974e2b07e087f66f0c9c2b43b6f3df6f7e1746a6252580f164427337d668c  buildkit-v0.10.3.linux-arm64.tar.gz
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit-bin.mk
@ -0,0 +1,52 @@
+################################################################################
+#
+# buildkit-bin
+#
+################################################################################
+
+BUILDKIT_BIN_AARCH64_VERSION = v0.10.3
+BUILDKIT_BIN_AARCH64_COMMIT = c8d25d9a103b70dc300a4fd55e7e576472284e31
+BUILDKIT_BIN_AARCH64_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_AARCH64_VERSION)
+BUILDKIT_BIN_AARCH64_SOURCE = buildkit-$(BUILDKIT_BIN_AARCH64_VERSION).linux-arm64.tar.gz
+
+# https://github.com/opencontainers/runc.git
+BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
+
+define BUILDKIT_BIN_AARCH64_USERS
+	- -1 buildkit -1 - - - - -
+endef
+
+define BUILDKIT_BIN_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildctl \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkit-runc \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkit-qemu-* \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 0755 \
+		$(@D)/buildkitd \
+		$(TARGET_DIR)/usr/sbin
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_AARCH64_PKGDIR)/buildkit.conf \
+		$(TARGET_DIR)/usr/lib/tmpfiles.d/buildkit.conf
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_AARCH64_PKGDIR)/buildkitd.toml \
+		$(TARGET_DIR)/etc/buildkit/buildkitd.toml
+endef
+
+define BUILDKIT_BIN_AARCH64_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_AARCH64_PKGDIR)/buildkit.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/buildkit.service
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_AARCH64_PKGDIR)/buildkit.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/buildkit.socket
+	$(INSTALL) -D -m 644 \
+		$(BUILDKIT_BIN_AARCH64_PKGDIR)/51-buildkit.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/51-buildkit.preset
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.service
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.service
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.socket
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkit.socket
--- a/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkitd.toml
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/buildkit-bin-aarch64/buildkitd.toml
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/Config.in
@ -0,0 +1,5 @@
+config BR2_PACKAGE_CNI_AARCH64
+	bool "cni"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-aarch64/cni.mk
@ -0,0 +1,45 @@
+################################################################################
+#
+# cni
+#
+################################################################################
+
+CNI_AARCH64_VERSION = v0.7.1
+CNI_AARCH64_SITE = https://github.com/containernetworking/cni/archive
+CNI_AARCH64_SOURCE = $(CNI_AARCH64_VERSION).tar.gz
+CNI_AARCH64_LICENSE = Apache-2.0
+CNI_AARCH64_LICENSE_FILES = LICENSE
+
+CNI_AARCH64_DEPENDENCIES = host-go
+
+CNI_AARCH64_GOPATH = $(@D)/_output
+CNI_AARCH64_MAKE_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=0 \
+	GO111MODULE=off \
+	GOPATH="$(CNI_AARCH64_GOPATH)" \
+	PATH=$(CNI_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+CNI_AARCH64_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"'
+
+define CNI_AARCH64_CONFIGURE_CMDS
+        mkdir -p $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking
+        ln -sf $(@D) $(CNI_AARCH64_GOPATH)/src/github.com/containernetworking/cni
+endef
+
+define CNI_AARCH64_BUILD_CMDS
+	(cd $(@D); $(CNI_AARCH64_MAKE_ENV) go build -o bin/cnitool $(CNI_AARCH64_BUILDFLAGS) ./cnitool)
+endef
+
+define CNI_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/bin/cnitool \
+		$(TARGET_DIR)/opt/cni/bin/cnitool
+
+	ln -sf \
+		../../opt/cni/bin/cnitool \
+		$(TARGET_DIR)/usr/bin/cnitool
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/Config.in
@ -0,0 +1,5 @@
+config BR2_PACKAGE_CNI_PLUGINS_AARCH64
+	bool "cni-plugins"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.hash
@ -0,0 +1 @@
+sha256 a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce  cni-plugins-linux-arm64-v0.8.5.tgz
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cni-plugins-aarch64/cni-plugins.mk
@ -0,0 +1,120 @@
+################################################################################
+#
+# cni-plugins
+#
+################################################################################
+
+CNI_PLUGINS_AARCH64_VERSION = v0.8.5
+CNI_PLUGINS_AARCH64_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_AARCH64_VERSION)
+CNI_PLUGINS_AARCH64_SOURCE = cni-plugins-linux-arm64-$(CNI_PLUGINS_AARCH64_VERSION).tgz
+CNI_PLUGINS_AARCH64_LICENSE = Apache-2.0
+CNI_PLUGINS_AARCH64_LICENSE_FILES = LICENSE
+
+define CNI_PLUGINS_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/bandwidth \
+		$(TARGET_DIR)/opt/cni/bin/bandwidth
+
+	ln -sf \
+		../../opt/cni/bin/bandwidth \
+		$(TARGET_DIR)/usr/bin/bandwidth
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/bridge \
+		$(TARGET_DIR)/opt/cni/bin/bridge
+
+	ln -sf \
+		../../opt/cni/bin/bridge \
+		$(TARGET_DIR)/usr/bin/bridge
+	
+	$(INSTALL) -D -m 0755 \
+		$(@D)/vlan \
+		$(TARGET_DIR)/opt/cni/bin/vlan
+
+	ln -sf \
+		../../opt/cni/bin/vlan \
+		$(TARGET_DIR)/usr/bin/vlan
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/tuning \
+		$(TARGET_DIR)/opt/cni/bin/tuning
+
+	ln -sf \
+		../../opt/cni/bin/tuning \
+		$(TARGET_DIR)/usr/bin/tuning
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/ptp \
+		$(TARGET_DIR)/opt/cni/bin/ptp
+
+	ln -sf \
+		../../opt/cni/bin/ptp \
+		$(TARGET_DIR)/usr/bin/ptp
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/portmap \
+		$(TARGET_DIR)/opt/cni/bin/portmap
+
+	ln -sf \
+		../../opt/cni/bin/portmap \
+		$(TARGET_DIR)/usr/bin/portmap
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/macvlan \
+		$(TARGET_DIR)/opt/cni/bin/macvlan
+
+	ln -sf \
+		../../opt/cni/bin/macvlan \
+		$(TARGET_DIR)/usr/bin/macvlan
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/loopback \
+		$(TARGET_DIR)/opt/cni/bin/loopback
+
+	ln -sf \
+		../../opt/cni/bin/loopback \
+		$(TARGET_DIR)/usr/bin/loopback
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/ipvlan \
+		$(TARGET_DIR)/opt/cni/bin/ipvlan
+
+	ln -sf \
+		../../opt/cni/bin/ipvlan \
+		$(TARGET_DIR)/usr/bin/ipvlan
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/host-local \
+		$(TARGET_DIR)/opt/cni/bin/host-local
+
+	ln -sf \
+		../../opt/cni/bin/host-local \
+		$(TARGET_DIR)/usr/bin/host-local
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/flannel \
+		$(TARGET_DIR)/opt/cni/bin/flannel
+
+	ln -sf \
+		../../opt/cni/bin/flannel \
+		$(TARGET_DIR)/usr/bin/flannel
+
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/dhcp \
+		$(TARGET_DIR)/opt/cni/bin/dhcp
+
+	ln -sf \
+		../../opt/cni/bin/dhcp \
+		$(TARGET_DIR)/usr/bin/dhcp
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/firewall \
+		$(TARGET_DIR)/opt/cni/bin/firewall
+
+	ln -sf \
+		../../opt/cni/bin/firewall \
+		$(TARGET_DIR)/usr/bin/firewall
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/50-minikube.preset
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/50-minikube.preset
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/Config.in
@ -0,0 +1,18 @@
+config BR2_PACKAGE_CONTAINERD_BIN_AARCH64
+	bool "containerd-bin"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # lvm2
+	depends on !BR2_STATIC_LIBS # lvm2
+	depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
+	select BR2_PACKAGE_RUNC_MASTER
+	select BR2_PACKAGE_BTRFS_PROGS
+	select BR2_PACKAGE_LIBSECCOMP
+	select BR2_PACKAGE_LIBGPGME
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_LVM2_APP_LIBRARY
+	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+	select BR2_PACKAGE_LIBGLIB2
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/config.toml.default
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
@ -0,0 +1,66 @@
+################################################################################
+#
+# containerd
+#
+################################################################################
+CONTAINERD_BIN_AARCH64_VERSION = v1.5.11
+CONTAINERD_BIN_AARCH64_COMMIT = 3df54a852345ae127d1fa3092b95168e4a88e2f8
+CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive
+CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz
+CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme
+CONTAINERD_BIN_AARCH64_GOPATH = $(@D)/_output
+CONTAINERD_BIN_AARCH64_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=1 \
+	GO111MODULE=off \
+	GOPATH="$(CONTAINERD_BIN_AARCH64_GOPATH)" \
+	PATH=$(CONTAINERD_BIN_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+CONTAINERD_BIN_AARCH64_COMPILE_SRC = $(CONTAINERD_BIN_AARCH64_GOPATH)/src/github.com/containerd/containerd
+
+define CONTAINERD_BIN_AARCH64_USERS
+	- -1 containerd-admin -1 - - - - -
+	- -1 containerd       -1 - - - - -
+endef
+
+define CONTAINERD_BIN_AARCH64_CONFIGURE_CMDS
+	mkdir -p $(CONTAINERD_BIN_AARCH64_GOPATH)/src/github.com/containerd
+	ln -sf $(@D) $(CONTAINERD_BIN_AARCH64_COMPILE_SRC)
+endef
+
+define CONTAINERD_BIN_AARCH64_BUILD_CMDS
+	PWD=$(CONTAINERD_BIN_AARCH64_COMPILE_SRC) $(CONTAINERD_BIN_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(CONTAINERD_BIN_AARCH64_VERSION) REVISION=$(CONTAINERD_BIN_AARCH64_COMMIT) -C $(@D) binaries
+endef
+
+define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd-shim \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd-shim-runc-v1 \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd-shim-runc-v2 \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/ctr \
+		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm644 \
+		$(CONTAINERD_BIN_AARCH64_PKGDIR)/config.toml \
+		$(TARGET_DIR)/etc/containerd/config.toml
+endef
+
+define CONTAINERD_BIN_AARCH64_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -Dm644 \
+		$(CONTAINERD_BIN_AARCH64_PKGDIR)/containerd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/containerd.service
+	$(INSTALL) -Dm644 \
+		$(CONTAINERD_BIN_AARCH64_PKGDIR)/50-minikube.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/50-minikube.preset
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd.service
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd.service
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/Config.in
@ -0,0 +1,8 @@
+config BR2_PACKAGE_CRI_DOCKERD_AARCH64
+	bool "cri-dockerd"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_DOCKER_BIN
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/cri-dockerd-aarch64/cri-dockerd.mk
@ -0,0 +1,49 @@
+################################################################################
+#
+# cri-dockerd
+#
+################################################################################
+
+# As of 2022-02-03
+CRI_DOCKERD_AARCH64_VER = 0.2.0
+CRI_DOCKERD_AARCH64_REV = a4d1895
+CRI_DOCKERD_AARCH64_VERSION = a4d1895a2659ea9974bd7528a706592ab8b74181
+CRI_DOCKERD_AARCH64_SITE = https://github.com/Mirantis/cri-dockerd/archive
+CRI_DOCKERD_AARCH64_SOURCE = $(CRI_DOCKERD_AARCH64_VERSION).tar.gz
+
+CRI_DOCKERD_AARCH64_DEPENDENCIES = host-go
+
+CRI_DOCKERD_AARCH64_GOPATH = $(@D)/_output
+CRI_DOCKERD_AARCH64_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=0 \
+	GO111MODULE=on \
+	GOPATH="$(CRI_DOCKERD_AARCH64_GOPATH)" \
+	PATH=$(CRI_DOCKERD_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+CRI_DOCKERD_AARCH64_COMPILE_SRC = $(CRI_DOCKERD_AARCH64_GOPATH)/src/github.com/Mirantis/cri-dockerd
+CRI_DOCKERD_AARCH64_BUILDFLAGS = "-ldflags '-X github.com/Mirantis/cri-dockerd/version.Version=$(CRI_DOCKERD_AARCH64_VER) -X github.com/Mirantis/cri-dockerd/version.GitCommit=$(CRI_DOCKERD_AARCH64_REV)'"
+
+# If https://github.com/Mirantis/cri-dockerd/blob/master/packaging/Makefile changes, then this will almost certainly need to change
+# This uses the static make target at the top level Makefile, since that builds everything, then picks out the arm64 binary
+define CRI_DOCKERD_AARCH64_BUILD_CMDS
+	$(CRI_DOCKERD_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) LDFLAGS=$(CRI_DOCKERD_AARCH64_BUILDFLAGS) GO_VERSION=$(GO_VERSION) -C $(@D) VERSION=$(CRI_DOCKERD_AARCH64_VER) REVISION=$(CRI_DOCKERD_AARCH64_REV) static
+endef
+
+define CRI_DOCKERD_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 \
+		$(@D)/packaging/static/build/arm/cri-dockerd/cri-dockerd \
+		$(TARGET_DIR)/usr/bin/cri-dockerd
+endef
+
+define CRI_DOCKERD_AARCH64_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -Dm644 \
+		$(@D)/packaging/systemd/cri-docker.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.service
+	$(INSTALL) -Dm644 \
+		$(@D)/packaging/systemd/cri-docker.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/cri-docker.socket
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/Config.in
@ -0,0 +1,4 @@
+config BR2_PACKAGE_CRICTL_BIN_AARCH64
+	bool "crictl-bin"
+	default y
+	depends on BR2_aarch64
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.hash
@ -0,0 +1 @@
+sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crictl-bin-aarch64/crictl-bin.mk
@ -0,0 +1,18 @@
+################################################################################
+#
+# crictl-bin
+#
+################################################################################
+
+CRICTL_BIN_AARCH64_VERSION = v1.21.0
+CRICTL_BIN_AARCH64_SITE = https://github.com/kubernetes-sigs/cri-tools/releases/download/$(CRICTL_BIN_AARCH64_VERSION)
+CRICTL_BIN_AARCH64_SOURCE = crictl-$(CRICTL_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
+CRICTL_BIN_AARCH64_STRIP_COMPONENTS = 0
+
+define CRICTL_BIN_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/crictl \
+		$(TARGET_DIR)/usr/bin/crictl
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/02-crio.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/02-crio.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/Config.in
@ -0,0 +1,20 @@
+config BR2_PACKAGE_CRIO_BIN_AARCH64
+	bool "crio-bin"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # lvm2
+	depends on !BR2_STATIC_LIBS # lvm2
+	depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
+	select BR2_PACKAGE_RUNC_MASTER
+	select BR2_PACKAGE_CRUN
+	select BR2_PACKAGE_CONMON
+	select BR2_PACKAGE_BTRFS_PROGS
+	select BR2_PACKAGE_LIBSECCOMP
+	select BR2_PACKAGE_LIBGPGME
+	select BR2_PACKAGE_LVM2
+	select BR2_PACKAGE_LVM2_APP_LIBRARY
+	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+	select BR2_PACKAGE_LIBGLIB2
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/conmon-config.h
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/conmon-config.h
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-bin.mk
@ -0,0 +1,79 @@
+################################################################################
+#
+# cri-o
+#
+################################################################################
+
+CRIO_BIN_AARCH64_VERSION = v1.22.3
+CRIO_BIN_AARCH64_COMMIT = d93b2dfb8d0f2ad0f8b9061d941e3b216baa5814
+CRIO_BIN_AARCH64_SITE = https://github.com/cri-o/cri-o/archive
+CRIO_BIN_AARCH64_SOURCE = $(CRIO_BIN_AARCH64_VERSION).tar.gz
+CRIO_BIN_AARCH64_DEPENDENCIES = host-go libgpgme
+CRIO_BIN_AARCH64_GOPATH = $(@D)/_output
+CRIO_BIN_AARCH64_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=1 \
+	GO111MODULE=off \
+	GOPATH="$(CRIO_BIN_AARCH64_GOPATH)" \
+	PATH=$(CRIO_BIN_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+
+define CRIO_BIN_AARCH64_USERS
+	- -1 crio-admin -1 - - - - -
+	- -1 crio       -1 - - - - -
+endef
+
+define CRIO_BIN_AARCH64_CONFIGURE_CMDS
+	mkdir -p $(CRIO_BIN_AARCH64_GOPATH)/src/github.com/cri-o
+	ln -sf $(@D) $(CRIO_BIN_AARCH64_GOPATH)/src/github.com/cri-o/cri-o
+	# disable the "automatic" go module detection
+	sed -e 's/go help mod/false/' -i $(@D)/Makefile
+endef
+
+define CRIO_BIN_AARCH64_BUILD_CMDS
+	mkdir -p $(@D)/bin
+	$(CRIO_BIN_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) COMMIT_NO=$(CRIO_BIN_AARCH64_COMMIT) PREFIX=/usr binaries
+endef
+
+define CRIO_BIN_AARCH64_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/containers/oci/hooks.d
+	mkdir -p $(TARGET_DIR)/etc/containers/oci/hooks.d
+	mkdir -p $(TARGET_DIR)/etc/crio/crio.conf.d
+
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/crio \
+		$(TARGET_DIR)/usr/bin/crio
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/pinns \
+		$(TARGET_DIR)/usr/bin/pinns
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/crio.conf \
+		$(TARGET_DIR)/etc/crio/crio.conf
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/policy.json \
+		$(TARGET_DIR)/etc/containers/policy.json
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/registries.conf \
+		$(TARGET_DIR)/etc/containers/registries.conf
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/02-crio.conf \
+		$(TARGET_DIR)/etc/crio/crio.conf.d/02-crio.conf
+
+	mkdir -p $(TARGET_DIR)/etc/sysconfig
+	echo 'CRIO_OPTIONS="--log-level=debug"' > $(TARGET_DIR)/etc/sysconfig/crio
+endef
+
+define CRIO_BIN_AARCH64_INSTALL_INIT_SYSTEMD
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) install.systemd DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/crio.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/crio.service
+	$(INSTALL) -Dm644 \
+		$(CRIO_BIN_AARCH64_PKGDIR)/crio-wipe.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/crio-wipe.service
+	$(call link-service,crio.service)
+	$(call link-service,crio-shutdown.service)
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-wipe.service
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio-wipe.service
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.conf.default
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.service
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/crio.service
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/policy.json
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/policy.json
--- a/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/registries.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/crio-bin-aarch64/registries.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/Config.in
@ -0,0 +1,4 @@
+config BR2_PACKAGE_DOCKER_BIN_AARCH64
+	bool "docker-bin"
+	default y
+	depends on BR2_aarch64
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/daemon.json
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.hash
@ -0,0 +1 @@
+sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker-bin.mk
@ -0,0 +1,55 @@
+################################################################################
+#
+# docker-bin
+#
+################################################################################
+
+DOCKER_BIN_AARCH64_VERSION = 20.10.14
+DOCKER_BIN_AARCH64_SITE = https://download.docker.com/linux/static/stable/aarch64
+DOCKER_BIN_AARCH64_SOURCE = docker-$(DOCKER_BIN_AARCH64_VERSION).tgz
+
+define DOCKER_BIN_AARCH64_USERS
+	- -1 docker -1 - - - - -
+endef
+
+define DOCKER_BIN_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker \
+		$(TARGET_DIR)/bin/docker
+
+	# As of 2019-05, we use upstream containerd so that we may update it independently of docker.
+
+	# As of 2019-01, we use upstream runc so that we may update it independently of docker.
+
+	# As of 2019-05, we use upstream ctr so that we may update it independently of docker.
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/dockerd \
+		$(TARGET_DIR)/bin/dockerd
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-init \
+		$(TARGET_DIR)/bin/docker-init
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-proxy \
+		$(TARGET_DIR)/bin/docker-proxy
+
+	# https://kubernetes.io/docs/setup/production-environment/container-runtimes/#docker
+
+	$(INSTALL) -Dm644 \
+		$(DOCKER_BIN_AARCH64_PKGDIR)/daemon.json \
+		$(TARGET_DIR)/etc/docker/daemon.json
+endef
+
+define DOCKER_BIN_AARCH64_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+		$(DOCKER_BIN_AARCH64_PKGDIR)/docker.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
+
+	$(INSTALL) -D -m 644 \
+		$(DOCKER_BIN_AARCH64_PKGDIR)/forward.conf \
+		$(TARGET_DIR)/etc/sysctl.d/forward.conf
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker.socket
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/docker.socket
--- a/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/forward.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/docker-bin-aarch64/forward.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/Config.in
@ -0,0 +1,12 @@
+config BR2_PACKAGE_PODMAN_AARCH64
+	bool "podman"
+	default y
+	depends on BR2_aarch64
+	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_RUNC_MASTER
+	select BR2_PACKAGE_CRUN
+	select BR2_PACKAGE_CONMON
+	select BR2_PACKAGE_LIBSECCOMP
+	select BR2_PACKAGE_LIBGPGME
--- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/override.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/override.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.conf
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.conf
--- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/podman-aarch64/podman.mk
@ -0,0 +1,71 @@
+PODMAN_AARCH64_VERSION = v3.4.2
+PODMAN_AARCH64_COMMIT = 2ad1fd3555de12de34e20898cc2ef901f08fe5ed
+PODMAN_AARCH64_SITE = https://github.com/containers/podman/archive
+PODMAN_AARCH64_SOURCE = $(PODMAN_AARCH64_VERSION).tar.gz
+PODMAN_AARCH64_LICENSE = Apache-2.0
+PODMAN_AARCH64_LICENSE_FILES = LICENSE
+
+PODMAN_AARCH64_DEPENDENCIES = host-go
+ifeq ($(BR2_INIT_SYSTEMD),y)
+# need libsystemd for journal
+PODMAN_AARCH64_DEPENDENCIES += systemd
+endif
+
+PODMAN_AARCH64_GOPATH = $(@D)/_output
+PODMAN_AARCH64_BIN_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=1 \
+	GOPATH="$(PODMAN_AARCH64_GOPATH)" \
+	PATH=$(PODMAN_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+
+define PODMAN_AARCH64_USERS
+	- -1 podman -1 - - - - -
+endef
+
+define PODMAN_AARCH64_MOD_VENDOR_MAKEFILE
+	# "build flag -mod=vendor only valid when using modules"
+	sed -e 's|-mod=vendor ||' -i $(@D)/Makefile
+endef
+
+PODMAN_AARCH64_POST_EXTRACT_HOOKS += PODMAN_AARCH64_MOD_VENDOR_MAKEFILE
+
+define PODMAN_AARCH64_CONFIGURE_CMDS
+	mkdir -p $(PODMAN_AARCH64_GOPATH) && mv $(@D)/vendor $(PODMAN_AARCH64_GOPATH)/src
+
+	mkdir -p $(PODMAN_AARCH64_GOPATH)/src/github.com/containers
+	ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman
+
+	ln -sf $(@D) $(PODMAN_AARCH64_GOPATH)/src/github.com/containers/podman/v2
+endef
+
+define PODMAN_AARCH64_BUILD_CMDS
+	mkdir -p $(@D)/bin
+	$(PODMAN_AARCH64_BIN_ENV) CIRRUS_TAG=$(PODMAN_AARCH64_VERSION) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(PODMAN_AARCH64_COMMIT) PREFIX=/usr podman
+endef
+
+define PODMAN_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -Dm755 $(@D)/bin/podman $(TARGET_DIR)/usr/bin/podman
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/etc/cni/net.d/
+	$(INSTALL) -m 644 $(@D)/cni/87-podman-bridge.conflist $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist
+endef
+
+define PODMAN_AARCH64_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+			$(@D)/contrib/systemd/system/podman.service \
+			$(TARGET_DIR)/usr/lib/systemd/system/podman.service
+	$(INSTALL) -D -m 644 \
+			$(@D)/contrib/systemd/system/podman.socket \
+			$(TARGET_DIR)/usr/lib/systemd/system/podman.socket
+
+	# Allow running podman-remote as a user in the group "podman"
+	$(INSTALL) -D -m 644 \
+			$(PODMAN_AARCH64_PKGDIR)/override.conf \
+			$(TARGET_DIR)/usr/lib/systemd/system/podman.socket.d/override.conf
+	$(INSTALL) -D -m 644 \
+			$(PODMAN_AARCH64_PKGDIR)/podman.conf \
+			$(TARGET_DIR)/usr/lib/tmpfiles.d/podman.conf
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/Config.in
@ -1,5 +1,6 @@
-config BR2_PACKAGE_RUNC_MASTER
+config BR2_PACKAGE_RUNC_MASTER_AARCH64
 	bool "runc-master"
+	default y
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
--- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.hash
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.hash
--- a/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk
+++ b/deploy/iso/minikube-iso/arch/aarch64/package/runc-master-aarch64/runc-master.mk
@ -0,0 +1,45 @@
+################################################################################
+#
+# runc
+#
+################################################################################
+
+# As of 2021-12-03, v1.0.3
+RUNC_MASTER_AARCH64_VERSION = f46b6ba2c9314cfc8caae24a32ec5fe9ef1059fe
+RUNC_MASTER_AARCH64_SITE = https://github.com/opencontainers/runc/archive
+RUNC_MASTER_AARCH64_SOURCE = $(RUNC_MASTER_AARCH64_VERSION).tar.gz
+RUNC_MASTER_AARCH64_LICENSE = Apache-2.0
+RUNC_MASTER_AARCH64_LICENSE_FILES = LICENSE
+
+RUNC_MASTER_AARCH64_DEPENDENCIES = host-go
+
+RUNC_MASTER_AARCH64_GOPATH = $(@D)/_output
+RUNC_MASTER_AARCH64_MAKE_ENV = \
+	$(GO_TARGET_ENV) \
+	CGO_ENABLED=1 \
+	GO111MODULE=off \
+	GOPATH="$(RUNC_MASTER_AARCH64_GOPATH)" \
+	PATH=$(RUNC_MASTER_AARCH64_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=arm64
+
+RUNC_MASTER_AARCH64_COMPILE_SRC = $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers/runc
+
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+RUNC_MASTER_AARCH64_GOTAGS += seccomp
+RUNC_MASTER_AARCH64_DEPENDENCIES += libseccomp host-pkgconf
+endif
+
+define RUNC_MASTER_AARCH64_CONFIGURE_CMDS
+	mkdir -p $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers
+	ln -s $(@D) $(RUNC_MASTER_AARCH64_GOPATH)/src/github.com/opencontainers/runc
+endef
+
+define RUNC_MASTER_AARCH64_BUILD_CMDS
+	PWD=$(RUNC_MASTER_AARCH64_COMPILE_SRC) $(RUNC_MASTER_AARCH64_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) BUILDTAGS="$(RUNC_MASTER_AARCH64_GOTAGS)" COMMIT_NO=$(RUNC_MASTER_AARCH64_VERSION) COMMIT=$(RUNC_MASTER_AARCH64_VERSION) PREFIX=/usr
+endef
+
+define RUNC_MASTER_AARCH64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/runc $(TARGET_DIR)/usr/bin/runc
+endef
+
+$(eval $(generic-package))
--- a/deploy/iso/minikube-iso/arch/x86_64/Config.in.tmpl
+++ b/deploy/iso/minikube-iso/arch/x86_64/Config.in.tmpl
@ -0,0 +1,2 @@
+source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"
+source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/Config.in"
--- a/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/Config.in
@ -0,0 +1,15 @@
+menu "System tools x86_64"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/conmon/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/buildkit-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/runc-master/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crio-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/crictl-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/docker-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cri-dockerd/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/cni-plugins/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/containerd-bin/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/podman/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/vbox-guest/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/arch/x86_64/package/hyperv-daemons/Config.in"
+endmenu
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/51-buildkit.preset
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/51-buildkit.preset
@ -0,0 +1 @@
+disable buildkit.service
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/Config.in
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.hash
@ -3,3 +3,4 @@ sha256 28005748fae926edf8c93b7cb1df53ec49df65dec67105b94e7fb9c513fa78a4  buildki
 sha256 e0438a701d4192f80b2211b0a333984ee4f097c547904e40fc941daad57fe153  buildkit-v0.8.1.linux-amd64.tar.gz
 sha256 d6d1ebc68806e626f31dd4ea17a406a93dcff14763971cd91b28cbaf3bfffcd4  buildkit-v0.8.2.linux-amd64.tar.gz
 sha256 1b307268735c8f8e68b55781a6f4c03af38acc1bc29ba39ebaec6d422bccfb25  buildkit-v0.9.0.linux-amd64.tar.gz
+sha256 fbc9c433cf77c5c00db6f797155edc60b44463524ae59a4961699dca15bcee00  buildkit-v0.10.3.linux-amd64.tar.gz
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit-bin.mk
@ -4,13 +4,14 @@
 #
 ################################################################################

-BUILDKIT_BIN_VERSION = v0.9.0
-BUILDKIT_BIN_COMMIT = c8bb937807d405d92be91f06ce2629e6202ac7a9
+BUILDKIT_BIN_VERSION = v0.10.3
+BUILDKIT_BIN_COMMIT = c8d25d9a103b70dc300a4fd55e7e576472284e31
 BUILDKIT_BIN_SITE = https://github.com/moby/buildkit/releases/download/$(BUILDKIT_BIN_VERSION)
 BUILDKIT_BIN_SOURCE = buildkit-$(BUILDKIT_BIN_VERSION).linux-amd64.tar.gz

 # https://github.com/opencontainers/runc.git
-BUILDKIT_RUNC_VERSION = 12644e614e25b05da6fd08a38ffa0cfe1903fdec
+BUILDKIT_RUNC_VERSION = v1.0.2
+BUILDKIT_RUNC_COMMIT = 52b36a2dd837e8462de8e01458bf02cf9eea47dd

 define BUILDKIT_BIN_USERS
 	- -1 buildkit -1 - - - - -
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.conf
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.conf
@ -0,0 +1 @@
+d /run/buildkit 0770 root buildkit
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.service
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.service
@ -0,0 +1,11 @@
+[Unit]
+Description=BuildKit
+Requires=buildkit.socket
+After=buildkit.socket
+Documentation=https://github.com/moby/buildkit
+
+[Service]
+ExecStart=/usr/sbin/buildkitd --addr fd://
+
+[Install]
+WantedBy=multi-user.target
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.socket
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkit.socket
@ -0,0 +1,12 @@
+[Unit]
+Description=BuildKit
+Documentation=https://github.com/moby/buildkit
+
+[Socket]
+ListenStream=%t/buildkit/buildkitd.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=buildkit
+
+[Install]
+WantedBy=sockets.target
--- a/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkitd.toml
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/buildkit-bin/buildkitd.toml
@ -0,0 +1,5 @@
+[worker.oci]
+  enabled = false
+[worker.containerd]
+  enabled = true
+  namespace = "k8s.io"
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/Config.in
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.hash
@ -2,3 +2,4 @@ sha256 f04339a21b8edf76d415e7f17b620e63b8f37a76b2f706671587ab6464411f2d  cni-plu
 sha256 8589670f7f9b211a351dfcd211d4fe0b961d77283a7415443dc188f3dbf05668  v0.6.0.tar.gz
 sha256 92c7599918be0a720ac020f137cdeac746dfa03da6b26e08a37132c5728c091f  v0.7.5.tar.gz
 sha256 9d1526ed965ac6562fd95a931ab2346b3c5efd58c2f569038ba3c530f7e66472  v0.8.5.tar.gz
+sha256 bd682ffcf701e8f83283cdff7281aad0c83b02a56084d6e601216210732833f9  cni-plugins-linux-amd64-v0.8.5.tgz
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk
@ -5,28 +5,14 @@
 ################################################################################

 CNI_PLUGINS_VERSION = v0.8.5
-CNI_PLUGINS_SITE = https://github.com/containernetworking/plugins/archive
-CNI_PLUGINS_SOURCE = $(CNI_PLUGINS_VERSION).tar.gz
+CNI_PLUGINS_SITE = https://github.com/containernetworking/plugins/releases/download/$(CNI_PLUGINS_VERSION)
+CNI_PLUGINS_SOURCE = cni-plugins-linux-amd64-$(CNI_PLUGINS_VERSION).tgz
 CNI_PLUGINS_LICENSE = Apache-2.0
 CNI_PLUGINS_LICENSE_FILES = LICENSE

-CNI_PLUGINS_DEPENDENCIES = host-go
-
-CNI_PLUGINS_MAKE_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=0 \
-	GO111MODULE=off
-
-CNI_PLUGINS_BUILDFLAGS = -a -ldflags '-extldflags -static -X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=$(CNI_PLUGINS_VERSION)'
-
-
-define CNI_PLUGINS_BUILD_CMDS
-	(cd $(@D); $(CNI_PLUGINS_MAKE_ENV) ./build_linux.sh $(CNI_PLUGINS_BUILDFLAGS))
-endef
-
 define CNI_PLUGINS_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/bandwidth \
+		$(@D)/bandwidth \
 		$(TARGET_DIR)/opt/cni/bin/bandwidth

 	ln -sf \
@ -34,7 +20,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/bandwidth

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/bridge \
+		$(@D)/bridge \
 		$(TARGET_DIR)/opt/cni/bin/bridge

 	ln -sf \
@ -42,7 +28,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/bridge
 	
 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/vlan \
+		$(@D)/vlan \
 		$(TARGET_DIR)/opt/cni/bin/vlan

 	ln -sf \
@ -50,7 +36,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/vlan

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/tuning \
+		$(@D)/tuning \
 		$(TARGET_DIR)/opt/cni/bin/tuning

 	ln -sf \
@ -58,7 +44,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/tuning

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/ptp \
+		$(@D)/ptp \
 		$(TARGET_DIR)/opt/cni/bin/ptp

 	ln -sf \
@ -66,7 +52,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/ptp

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/portmap \
+		$(@D)/portmap \
 		$(TARGET_DIR)/opt/cni/bin/portmap

 	ln -sf \
@ -74,7 +60,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/portmap

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/macvlan \
+		$(@D)/macvlan \
 		$(TARGET_DIR)/opt/cni/bin/macvlan

 	ln -sf \
@ -82,7 +68,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/macvlan

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/loopback \
+		$(@D)/loopback \
 		$(TARGET_DIR)/opt/cni/bin/loopback

 	ln -sf \
@ -90,7 +76,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/loopback

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/ipvlan \
+		$(@D)/ipvlan \
 		$(TARGET_DIR)/opt/cni/bin/ipvlan

 	ln -sf \
@ -98,7 +84,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/ipvlan

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/host-local \
+		$(@D)/host-local \
 		$(TARGET_DIR)/opt/cni/bin/host-local

 	ln -sf \
@ -106,7 +92,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/host-local

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/flannel \
+		$(@D)/flannel \
 		$(TARGET_DIR)/opt/cni/bin/flannel

 	ln -sf \
@ -115,7 +101,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS


 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/dhcp \
+		$(@D)/dhcp \
 		$(TARGET_DIR)/opt/cni/bin/dhcp

 	ln -sf \
@ -123,7 +109,7 @@ define CNI_PLUGINS_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/bin/dhcp

 	$(INSTALL) -D -m 0755 \
-		$(@D)/bin/firewall \
+		$(@D)/firewall \
 		$(TARGET_DIR)/opt/cni/bin/firewall

 	ln -sf \
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni/Config.in
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.hash
@ -0,0 +1,6 @@
+sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d  cni-v0.3.0.tgz
+sha256 84c9a0a41b59211d560bef14bf3f53bb370156f9ac7762270b3848fed96e1be8  cni-v0.4.0.tgz
+sha256 a7f84a742c8f3a95843b3cc636444742554a4853835649ec371a07c841daebab  cni-amd64-v0.6.0.tgz
+sha256 802f4a002b4eb774624a9dc1c859d3c9926eb2d862e66a673fc99cfc8bcd7494  v0.6.0.tar.gz
+sha256 78d57477d6b0ab9dc4d75ce9f275302d2f379206b5326503e57d9c08b76484c1  v0.7.0.tar.gz
+sha256 4517eabfd65aea2012dc48d057bf889a0a41ed9837387d95cd1e36c0dbddcfd4  v0.7.1.tar.gz
--- a/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/cni/cni.mk
@ -19,7 +19,8 @@ CNI_MAKE_ENV = \
 	GO111MODULE=off \
 	GOPATH="$(CNI_GOPATH)" \
 	GOBIN="$(CNI_GOPATH)/bin" \
-	PATH=$(CNI_GOPATH)/bin:$(BR_PATH)
+	PATH=$(CNI_GOPATH)/bin:$(BR_PATH) \
+	GOARCH=amd64

 CNI_BUILDFLAGS = -a --ldflags '-extldflags \"-static\"'

--- a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/Config.in
@ -1,5 +1,6 @@
 config BR2_PACKAGE_CONMON
 	bool "conmon"
+	depends on BR2_x86_64
 	depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
--- a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.hash
--- a/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/conmon/conmon.mk
--- a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/50-minikube.preset
+++ b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/50-minikube.preset
@ -0,0 +1 @@
+disable containerd.service
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`source "$BR2_EXTERNAL_MINIKUBE_PATH/package/Config.in"`
				`@ -0,0 +1 @@`
				`sha256 a7881ec37e592c897bdfd2a225b4ed74caa981e3c4cdcf8f45574f8d2f111bce cni-plugins-linux-arm64-v0.8.5.tgz`
				`@ -0,0 +1 @@`
				`sha256 454eecd29fe636282339af5b73c60234a7d10e4b11b9e18937e33056763d72cf crictl-v1.21.0-linux-arm64.tar.gz`
				`@ -0,0 +1 @@`
				`sha256 ea971edc1179088bfd25edd04a0c12848143d15cb8202ebb93a6a08973464fd0 docker-20.10.14.tgz`