Merge pull request #14768 from BenTheElder/binfmt_fire

don't touch binfmt_misc in prow

Author: k8s-ci-robot

images/bootstrap/runner.sh

@@ -24,23 +24,6 @@ if [[ "${BAZEL_REMOTE_CACHE_ENABLED}" == "true" ]]; then
 fi
 
 
-# used by cleanup_dind to ensure binfmt_misc entries are not persisted
-# TODO: consider moving *all* cleanup into a more robust program
-cleanup_binfmt_misc() {
-    # make sure the vfs is mounted
-    # TODO: if this logic is moved out and made more general
-    # we need to check that the host actually has binfmt_misc support first.
-    if [ ! -f /proc/sys/fs/binfmt_misc/status ]; then
-        mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
-    fi
-    # https://www.kernel.org/doc/html/v4.13/admin-guide/binfmt-misc.html
-    # You can remove one entry or all entries by echoing -1 
-    # to /proc/.../the_name or /proc/sys/fs/binfmt_misc/status.
-    echo -1 >/proc/sys/fs/binfmt_misc/status
-    # list entries
-    ls -al /proc/sys/fs/binfmt_misc
-}
-
 # runs custom docker data root cleanup binary and debugs remaining resources
 cleanup_dind() {
     barnacle || true
@@ -50,8 +33,6 @@ cleanup_dind() {
     docker volume ls || true
     # cleanup binfmt_misc
     echo "Cleaning up binfmt_misc ..."
-    # note: we run this in a subshell so we can trace it for now
-    (set -x; cleanup_binfmt_misc || true)
 }
 
 # optionally enable ipv6 docker