Merge branch 'master' into docker-20.10.14

2022-03-28 16:57:07 -07:00 · 2022-03-28 16:57:07 -07:00 · 425c2901c6
parent b2c153d9d8 d38da0bed8
commit 425c2901c6
29 changed files with 174 additions and 117 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -20,8 +20,8 @@ jobs:
  build_minikube:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -40,15 +40,15 @@ jobs:
          echo workspace $GITHUB_WORKSPACE
          echo "end of debug stuff"
          echo $(which jq)
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: minikube_binaries
          path: out
  lint:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -66,8 +66,8 @@ jobs:
  unit_test:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@ -14,8 +14,8 @@ jobs:
  generate-docs:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        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
@ -33,8 +33,8 @@ jobs:
    if: contains(github.event.pull_request.labels.*.name, 'ok-to-test')
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -46,7 +46,7 @@ jobs:
          sudo apt-get install -y libvirt-dev
          MINIKUBE_BUILD_IN_DOCKER=y make cross e2e-cross debs
          cp -r test/integration/testdata ./out
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: minikube_binaries
          path: out
@ -115,13 +115,13 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true

      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries

@ -167,7 +167,7 @@ jobs:
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV

-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_docker_ubuntu_arm64
          path: minikube_binaries/report
@ -204,14 +204,14 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: download all extra reports
-        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 # v2-preview
+        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405
      - name: upload all extra reports
        shell: bash {0}
        continue-on-error: true
        run: |
          mkdir -p all_reports
          cp -r ./functional_docker_ubuntu_arm64 ./all_reports/
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: all_reports
          path: all_reports
--- a/.github/workflows/leaderboard.yml
+++ b/.github/workflows/leaderboard.yml
@ -15,8 +15,8 @@ jobs:
  update-leaderboard:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: Update leaderboard
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -24,8 +24,8 @@ jobs:
  build_minikube:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -44,15 +44,15 @@ jobs:
          echo workspace $GITHUB_WORKSPACE
          echo "end of debug stuff"
          echo $(which jq)
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: minikube_binaries
          path: out
  lint:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -70,8 +70,8 @@ jobs:
  unit_test:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -120,7 +120,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -131,7 +131,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -169,7 +169,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_docker_ubuntu
          path: minikube_binaries/report
@ -221,7 +221,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -232,7 +232,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -270,7 +270,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_docker_containerd_ubuntu
          path: minikube_binaries/report
@ -326,7 +326,7 @@ jobs:
        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 # v2
+    - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
      with:
        go-version: ${{env.GO_VERSION}}
        stable: true
@ -336,7 +336,7 @@ jobs:
        curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
        sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
    - name: Download Binaries
-      uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+      uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
      with:
        name: minikube_binaries
    - name: Run Integration Test
@ -374,7 +374,7 @@ jobs:
        echo 'STAT<<EOF' >> $GITHUB_ENV
        echo "${STAT}" >> $GITHUB_ENV
        echo 'EOF' >> $GITHUB_ENV
-    - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+    - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
      with:
        name: functional_podman_ubuntu
        path: minikube_binaries/report
@ -413,7 +413,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -439,7 +439,7 @@ jobs:
          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
          sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -475,7 +475,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_virtualbox_macos
          path: minikube_binaries/report
@ -524,7 +524,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -535,7 +535,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -571,7 +571,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: none_ubuntu18_04
          path: minikube_binaries/report
@ -608,7 +608,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: download all reports
-        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 # v2-preview
+        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405
      - name: upload all reports
        shell: bash {0}
        continue-on-error: true
@ -621,7 +621,7 @@ jobs:
          cp -r ./functional_virtualbox_macos ./all_reports/
          cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/

-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: all_reports
          path: all_reports
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -22,8 +22,8 @@ jobs:
  build_minikube:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -42,15 +42,15 @@ jobs:
          echo workspace $GITHUB_WORKSPACE
          echo "end of debug stuff"
          echo $(which jq)
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: minikube_binaries
          path: out
  lint:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -68,8 +68,8 @@ jobs:
  unit_test:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -118,7 +118,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -128,7 +128,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -167,7 +167,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_docker_ubuntu
          path: minikube_binaries/report
@ -219,7 +219,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -230,7 +230,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -269,7 +269,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_docker_containerd_ubuntu
          path: minikube_binaries/report
@ -325,7 +325,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -335,7 +335,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -374,7 +374,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_podman_ubuntu
          path: minikube_binaries/report
@ -413,7 +413,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -439,7 +439,7 @@ jobs:
          sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
          sudo /usr/libexec/ApplicationFirewall/socketfilterfw -k
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -476,7 +476,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: functional_virtualbox_macos
          path: minikube_binaries/report
@ -525,7 +525,7 @@ jobs:
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -536,7 +536,7 @@ jobs:
          curl -LO https://github.com/medyagh/gopogh/releases/download/v0.9.0/gopogh-linux-amd64
          sudo install gopogh-linux-amd64 /usr/local/bin/gopogh
      - name: Download Binaries
-        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95 # v1
+        uses: actions/download-artifact@fdafc3f9f2e2a522dc1d230e6a03de57a1e71c95
        with:
          name: minikube_binaries
      - name: Run Integration Test
@ -573,7 +573,7 @@ jobs:
          echo 'STAT<<EOF' >> $GITHUB_ENV
          echo "${STAT}" >> $GITHUB_ENV
          echo 'EOF' >> $GITHUB_ENV
-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: none_ubuntu18_04
          path: minikube_binaries/report
@ -610,7 +610,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
      - name: download all reports
-        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405 # v2-preview
+        uses: actions/download-artifact@9fde3de0b74bd6bc202952485c264b551a4f9405
      - name: upload all reports
        shell: bash {0}
        continue-on-error: true
@ -623,7 +623,7 @@ jobs:
          cp -r ./functional_virtualbox_macos ./all_reports/
          cp -r ./functional_baremetal_ubuntu18_04 ./all_reports/

-      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # v2
+      - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535
        with:
          name: all_reports
          path: all_reports
--- a/.github/workflows/sync-minikube.yml
+++ b/.github/workflows/sync-minikube.yml
@ -16,13 +16,13 @@ jobs:
      run:
        working-directory: ./image-syncer
    steps:
-    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
+    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
      with:
        repository: denverdino/image-syncer
        path: ./image-syncer

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

--- a/.github/workflows/time-to-k8s-public-chart.yml
+++ b/.github/workflows/time-to-k8s-public-chart.yml
@ -19,8 +19,8 @@ jobs:
      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
      AWS_DEFAULT_REGION: 'us-west-1'
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -38,14 +38,14 @@ jobs:
      AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
      AWS_DEFAULT_REGION: 'us-west-1'
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
      - name: Install kubectl
        shell: bash
        run: |
          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 # v2
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/time-to-k8s.yml
+++ b/.github/workflows/time-to-k8s.yml
@ -13,10 +13,10 @@ jobs:
  benchmark:
    runs-on: ubuntu-20.04
    steps:
-    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
+    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
    - name: Checkout submodules
      run: git submodule update --init
-    - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+    - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
      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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+      uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
      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
@ -14,8 +14,8 @@ jobs:
  unit_test:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
--- a/.github/workflows/twitter-bot.yml
+++ b/.github/workflows/twitter-bot.yml
@ -10,7 +10,7 @@ jobs:
  twitter-release:
    runs-on: ubuntu-20.04
    steps:
-      - uses: ethomson/send-tweet-action@288f9339e0412e3038dce350e0da5ecdf12133a6 # v1
+      - 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"
          consumer-key: ${{ secrets.TWITTER_API_KEY }}
--- a/.github/workflows/update-golang-version.yml
+++ b/.github/workflows/update-golang-version.yml
@ -14,8 +14,8 @@ jobs:
  bump-golang-version:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        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
@ -14,8 +14,8 @@ jobs:
  bump-golint-version:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        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
@ -14,8 +14,8 @@ jobs:
  bump-k8s-versions:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        with:
          go-version: ${{env.GO_VERSION}}
          stable: true
@ -31,7 +31,7 @@ jobs:
          echo "::set-output name=changes::$c"
      - name: Create PR
        if: ${{ steps.bumpk8s.outputs.changes != '' }}
-        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        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
@ -14,8 +14,8 @@ jobs:
  bump-k8s-versions:
    runs-on: ubuntu-20.04
    steps:
-      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
-      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab # v2
+      - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5
+      - uses: actions/setup-go@f6164bd8c8acb4a71fb2791a8b6c4024ff038dab
        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@d6d5519d05f5814158ef015b8448f2f74648c421 # v3
+        uses: peter-evans/create-pull-request@d6d5519d05f5814158ef015b8448f2f74648c421
        with:
          token: ${{ secrets.MINIKUBE_BOT_PAT }}
          commit-message: update image constants for kubeadm images
--- a/2
+++ b/2
@ -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-1648493470-13860
+ISO_VERSION ?= v1.25.2-1648488960-11679
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))
 DEB_REVISION ?= 0
--- a/deploy/iso/minikube-iso/package/Config.in
+++ b/deploy/iso/minikube-iso/package/Config.in
@ -1,5 +1,6 @@
 menu "System tools"
    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/runc-master/Config.in"
+    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crun/Config.in"
    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/podman/Config.in"
    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/conmon/Config.in"
    source "$BR2_EXTERNAL_MINIKUBE_PATH/package/crio-bin/Config.in"
--- a/deploy/iso/minikube-iso/package/crio-bin/Config.in
+++ b/deploy/iso/minikube-iso/package/crio-bin/Config.in
@ -9,6 +9,7 @@ config BR2_PACKAGE_CRIO_BIN
 	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
--- a/deploy/iso/minikube-iso/package/crun/Config.in
+++ b/deploy/iso/minikube-iso/package/crun/Config.in
@ -0,0 +1,8 @@
+config BR2_PACKAGE_CRUN
+	bool "crun"
+	select BR2_PACKAGE_YAJL
+	help
+	  A fast and low-memory footprint OCI Container Runtime
+	  fully written in C.
+
+	  https://github.com/containers/crun
--- a/deploy/iso/minikube-iso/package/crun/crun.hash
+++ b/deploy/iso/minikube-iso/package/crun/crun.hash
@ -0,0 +1,8 @@
+# Locally computed
+sha256 8065b73ae37ccfb960915fa10051e2bf27850d1c2c69ffeb9eec17c6f198d1c9  crun-0.19.tar.gz
+sha256 7b190ff934355e69636e24c12864326a6ebccdbb12af1f14bead217118eb19cb  crun-0.19.1.tar.gz
+sha256 93423c730ac8deb8dacf805fb15dc5c3ac12e47f8a3eb36dd42166ccfd023d00  crun-0.20.tar.gz
+sha256 84a31b25169d92b59a2611fe256a2cc48b05edd9aee8eab4e3dabb60d88f5a23  crun-0.20.1.tar.gz
+sha256 e1745172bf603c6832e1a77ee2b7ac9ad4644cd0f4349704df84b66385bbbe61  crun-1.0.tar.gz
+sha256 5f2d98a13bdd7ab3c83620abc7dc29cfaf7b8f7487b5b3722453bc9619d3ea0b  crun-1.1.tar.gz
+sha256 1032a69878c18ddeeb97cd26251c2819afb76e0d4a50c047139829b00d147978  crun-1.2.tar.gz
--- a/deploy/iso/minikube-iso/package/crun/crun.mk
+++ b/deploy/iso/minikube-iso/package/crun/crun.mk
@ -0,0 +1,38 @@
+################################################################################
+#
+# crun
+#
+################################################################################
+
+CRUN_VERSION = 1.2
+CRUN_COMMIT = 4f6c8e0583c679bfee6a899c05ac6b916022561b
+# need the pre-generated release tarball with the git submodules and configure
+CRUN_SITE = https://github.com/containers/crun/releases/download/$(CRUN_VERSION)
+CRUN_LICENSE = GPL-2.0
+CRUN_LICENSE_FILES = COPYING
+
+CRUN_DEPENDENCIES += host-python3
+
+CRUN_MAKE_OPTS = crun
+
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+CRUN_DEPENDENCIES += libcap
+else
+CRUN_CONF_OPTS += --disable-caps
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+CRUN_CONF_OPTS += --enable-seccomp
+CRUN_DEPENDENCIES += libseccomp host-pkgconf
+else
+CRUN_CONF_OPTS += --disable-seccomp
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+CRUN_CONF_OPTS += --enable-systemd
+CRUN_DEPENDENCIES += systemd host-pkgconf
+else
+CRUN_CONF_OPTS += --disable-systemd
+endif
+
+$(eval $(autotools-package))
--- a/deploy/iso/minikube-iso/package/podman/Config.in
+++ b/deploy/iso/minikube-iso/package/podman/Config.in
@ -6,6 +6,7 @@ config BR2_PACKAGE_PODMAN
 	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/go.mod
+++ b/go.mod
@ -70,9 +70,9 @@ require (
 	github.com/spf13/viper v1.10.1
 	github.com/zchee/go-vmnet v0.0.0-20161021174912-97ebf9174097
 	go.opencensus.io v0.23.0
-	go.opentelemetry.io/otel v1.6.0
-	go.opentelemetry.io/otel/sdk v1.6.0
-	go.opentelemetry.io/otel/trace v1.6.0
+	go.opentelemetry.io/otel v1.6.1
+	go.opentelemetry.io/otel/sdk v1.6.1
+	go.opentelemetry.io/otel/trace v1.6.1
 	golang.org/x/build v0.0.0-20190927031335-2835ba2e683f
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
 	golang.org/x/exp v0.0.0-20210220032938-85be41e4509f
--- a/go.sum
+++ b/go.sum
@ -1192,8 +1192,8 @@ go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzox
 go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU=
 go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA=
 go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs=
-go.opentelemetry.io/otel v1.6.0 h1:YV6GkGe/Ag2PKsm4rjlqdSNs0w0A5ZzxeGkxhx1T+t4=
-go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ=
+go.opentelemetry.io/otel v1.6.1 h1:6r1YrcTenBvYa1x491d0GGpTVBsNECmrc/K6b+zDeis=
+go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ=
 go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM=
 go.opentelemetry.io/otel/internal/metric v0.24.0 h1:O5lFy6kAl0LMWBjzy3k//M8VjEaTDWL9DPJuqZmWIAA=
 go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk=
@ -1203,16 +1203,16 @@ go.opentelemetry.io/otel/metric v0.24.0/go.mod h1:tpMFnCD9t+BEGiWY2bWF5+AwjuAdM0
 go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw=
 go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc=
 go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs=
-go.opentelemetry.io/otel/sdk v1.6.0 h1:JoriAoiNENuxxIQApR1O0k2h1Md5QegZhbentcRJpWk=
-go.opentelemetry.io/otel/sdk v1.6.0/go.mod h1:PjLRUfDsoPy0zl7yrDGSUqjj43tL7rEtFdCEiGlxXRM=
+go.opentelemetry.io/otel/sdk v1.6.1 h1:ZmcNyMhcuAYIb/Nr6QhBPTMopMTbov/47wHt1gibkoY=
+go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E=
 go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE=
 go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE=
 go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw=
 go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk=
 go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI=
 go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk=
-go.opentelemetry.io/otel/trace v1.6.0 h1:NDzPermp9ISkhxIaJXjBTi2O60xOSHDHP/EezjOL2wo=
-go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE=
+go.opentelemetry.io/otel/trace v1.6.1 h1:f8c93l5tboBYZna1nWk0W9DYyMzJXDWdZcJZ0Kb400U=
+go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
--- a/pkg/minikube/constants/constants.go
+++ b/pkg/minikube/constants/constants.go
@ -33,10 +33,10 @@ var (
 const (
 	// DefaultKubernetesVersion is the default Kubernetes version
 	// dont update till #10545 is solved
-	DefaultKubernetesVersion = "v1.23.3"
+	DefaultKubernetesVersion = "v1.23.5"
 	// NewestKubernetesVersion is the newest Kubernetes version to test against
 	// NOTE: You may need to update coreDNS & etcd versions in pkg/minikube/bootstrapper/images/images.go
-	NewestKubernetesVersion = "v1.23.4-rc.0"
+	NewestKubernetesVersion = "v1.23.6-rc.0"
 	// OldestKubernetesVersion is the oldest Kubernetes version to test against
 	OldestKubernetesVersion = "v1.16.0"
 	// NoKubernetesVersion is the version used when users does NOT want to install kubernetes
--- a/pkg/minikube/download/iso.go
+++ b/pkg/minikube/download/iso.go
@ -40,7 +40,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/13860"
+	isoBucket := "minikube-builds/iso/11679"
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s.iso", isoBucket, v),
 		fmt.Sprintf("https://github.com/kubernetes/minikube/releases/download/%s/minikube-%s.iso", v, v),
--- a/site/content/en/docs/commands/start.md
+++ b/site/content/en/docs/commands/start.md
@ -69,9 +69,9 @@ minikube start [flags]
      --insecure-registry strings         Insecure Docker registries to pass to the Docker daemon.  The default service CIDR range will automatically be added.
      --install-addons                    If set, install addons. Defaults to true. (default true)
      --interactive                       Allow user prompts for more information (default true)
-      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/13860/minikube-v1.25.2-1648493470-13860.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648493470-13860/minikube-v1.25.2-1648493470-13860.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648493470-13860.iso])
+      --iso-url strings                   Locations to fetch the minikube ISO from. (default [https://storage.googleapis.com/minikube-builds/iso/11679/minikube-v1.25.2-1648488960-11679.iso,https://github.com/kubernetes/minikube/releases/download/v1.25.2-1648488960-11679/minikube-v1.25.2-1648488960-11679.iso,https://kubernetes.oss-cn-hangzhou.aliyuncs.com/minikube/iso/minikube-v1.25.2-1648488960-11679.iso])
      --keep-context                      This will keep the existing kubectl context and will create a minikube context.
-      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.3, 'latest' for v1.23.4-rc.0). Defaults to 'stable'.
+      --kubernetes-version string         The Kubernetes version that the minikube VM will use (ex: v1.2.3, 'stable' for v1.23.5, 'latest' for v1.23.6-rc.0). Defaults to 'stable'.
      --kvm-gpu                           Enable experimental NVIDIA GPU support in minikube
      --kvm-hidden                        Hide the hypervisor signature from the guest in minikube (kvm2 driver only)
      --kvm-network string                The KVM default network name. (kvm2 driver only) (default "default")
--- a/site/content/en/docs/tutorials/setup_minikube_gui.md
+++ b/site/content/en/docs/tutorials/setup_minikube_gui.md
@ -24,7 +24,7 @@ date: 2022-02-25
 {{% tab Stable %}}
 1. Download the zipped folder
 ```shell
-curl -LO https://storage.googleapis.com/minikube-gui/v0.0.1/minikube-gui-mac.zip
+curl -LO https://storage.googleapis.com/minikube-gui/latest/minikube-gui-mac.zip
 ```
 {{% /tab %}}
 {{% tab Nightly %}}
@ -54,9 +54,9 @@ open dist/systray.app
 {{% windowstab %}}
 {{% tabs %}}
 {{% tab Stable %}}
-1. Download the zipped folder via PowerShell (below) or via your [browser](https://storage.googleapis.com/minikube-gui/v0.0.1/minikube-gui-windows.zip) (faster)
+1. Download the zipped folder via PowerShell (below) or via your [browser](https://storage.googleapis.com/minikube-gui/latest/minikube-gui-windows.zip) (faster)
 ```shell
-Invoke-WebRequest -Uri 'https://storage.googleapis.com/minikube-gui/v0.0.1/minikube-gui-windows.zip' -UseBasicParsing
+Invoke-WebRequest -Uri 'https://storage.googleapis.com/minikube-gui/latest/minikube-gui-windows.zip' -UseBasicParsing
 ```
 {{% /tab %}}
 {{% tab Nightly %}}
@ -86,7 +86,7 @@ Expand-Archive minikube-gui-windows.zip
 {{% tab Stable %}}
 1. Download the zipped folder
 ```shell
-curl -LO https://storage.googleapis.com/minikube-gui/v0.0.1/minikube-gui-linux.zip
+curl -LO https://storage.googleapis.com/minikube-gui/latest/minikube-gui-linux.zip
 ```
 {{% /tab %}}
 {{% tab Nightly %}}
--- a/translations/fr.json
+++ b/translations/fr.json
@ -65,7 +65,7 @@
 	"Another minikube instance is downloading dependencies... ": "Une autre instance minikube télécharge des dépendances",
 	"Another program is using a file required by minikube. If you are using Hyper-V, try stopping the minikube VM from within the Hyper-V manager": "Un autre programme utilise un fichier requis par minikube. Si vous utilisez Hyper-V, essayez d'arrêter la machine virtuelle minikube à partir du gestionnaire Hyper-V",
 	"At least needs control plane nodes to enable addon": "Nécessite au moins des nœuds de plan de contrôle pour activer le module",
-	"Auto-pause is already enabled.": "",
+	"Auto-pause is already enabled.": "La pause automatique est déjà activée.",
 	"Automatically selected the {{.driver}} driver": "Choix automatique du pilote {{.driver}}",
 	"Automatically selected the {{.driver}} driver. Other choices: {{.alternates}}": "Choix automatique du pilote {{.driver}}. Autres choix: {{.alternates}}",
 	"Available Commands": "Commandes disponibles",
@ -319,9 +319,9 @@
 	"If present, writes to the provided file instead of stdout.": "S'il est présent, écrit dans le fichier fourni au lieu de la sortie standard.",
 	"If set, automatically updates drivers to the latest version. Defaults to true.": "Si défini, met automatiquement à jour les pilotes vers la dernière version. La valeur par défaut est true.",
 	"If set, delete the current cluster if start fails and try again. Defaults to false.": "Si défini, supprime le cluster actuel si le démarrage échoue et réessaye. La valeur par défaut est false.",
-	"If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.": "",
+	"If set, disables metrics reporting (CPU and memory usage), this can improve CPU usage. Defaults to false.": "S'il est défini, désactive les rapports de métriques (utilisation du processeur et de la mémoire), cela peut améliorer l'utilisation du processeur. La valeur par défaut est false.",
 	"If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1 and increasing kubeadm housekeeping-interval from 10s to 5m. Defaults to false.": "S'il est défini, désactive les optimisations définies pour Kubernetes local. Y compris la diminution des répliques CoreDNS de 2 à 1 et l'augmentation de l'intervalle de maintenance kubeadm de 10 s à 5 m. La valeur par défaut est false.",
-	"If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.": "",
+	"If set, disables optimizations that are set for local Kubernetes. Including decreasing CoreDNS replicas from 2 to 1. Defaults to false.": "S'il est défini, désactive les optimisations définies pour Kubernetes local. Y compris la diminution des répliques CoreDNS de 2 à 1. La valeur par défaut est false.",
 	"If set, download tarball of preloaded images if available to improve start time. Defaults to true.": "Si défini, télécharge l'archive tar des images préchargées si disponibles pour améliorer le temps de démarrage. La valeur par défaut est true.",
 	"If set, force the container runtime to use systemd as cgroup manager. Defaults to false.": "S'il est défini, force l'environnement d'exécution du conteneur à utiliser systemd comme gestionnaire de groupe de contrôle. La valeur par défaut est false.",
 	"If set, install addons. Defaults to true.": "Si défini, installe les modules. La valeur par défaut est true.",
@ -969,9 +969,9 @@
 	"{{.name}} is already running": "{{.name}} est déjà en cours d'exécution",
 	"{{.name}} was successfully configured": "{{.name}} a été configuré avec succès",
 	"{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity)": "{{.n}} manque presque d'espace disque, ce qui peut entraîner l'échec des déploiements ! ({{.p}} % de la capacité)",
-	"{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity). You can pass '--force' to skip this check.": "",
+	"{{.n}} is nearly out of disk space, which may cause deployments to fail! ({{.p}}% of capacity). You can pass '--force' to skip this check.": "{{.n}} est presque à court d'espace disque, ce qui peut entraîner l'échec des déploiements ! ({{.p}} % de la capacité). Vous pouvez passer '--force' pour ignorer cette vérification.",
 	"{{.n}} is out of disk space! (/var is at {{.p}}% of capacity)": "{{.n}} n'a plus d'espace disque ! (/var est à {{.p}} % de capacité)",
-	"{{.n}} is out of disk space! (/var is at {{.p}}% of capacity). You can pass '--force' to skip this check.": "",
+	"{{.n}} is out of disk space! (/var is at {{.p}}% of capacity). You can pass '--force' to skip this check.": "{{.n}} n'a plus d'espace disque ! (/var est à {{.p}} % de la capacité). Vous pouvez passer '--force' pour ignorer cette vérification.",
 	"{{.ociBin}} rmi {{.images}}": "{{.ociBin}} rmi {{.images}}",
 	"{{.ocibin}} is taking an unsually long time to respond, consider restarting {{.ocibin}}": "{{.ocibin}} prend un temps anormalement long pour répondre, pensez à redémarrer {{.ocibin}}",
 	"{{.path}} is version {{.client_version}}, which may have incompatibilites with Kubernetes {{.cluster_version}}.": "{{.path}} est la version {{.client_version}}, qui peut comporter des incompatibilités avec Kubernetes {{.cluster_version}}.",