Merge pull request kubernetes#16237 from BenTheElder/remove-some-debt

Remove some debt

BUILD.bazel

@@ -105,7 +105,6 @@ filegroup(
         "//gopherage:all-srcs",
         "//greenhouse:all-srcs",
         "//hack:all-srcs",
-        "//images/bootstrap/barnacle:all-srcs",
         "//images/builder:all-srcs",
         "//images/krte:all-srcs",
         "//images/kubekins-e2e:all-srcs",

images/bootstrap/Dockerfile

@@ -113,9 +113,6 @@ RUN echo 'DOCKER_OPTS="${DOCKER_OPTS} --data-root=/docker-graph"' | \
 # We will make a fallback one now just in case
 RUN mkdir /docker-graph
 
-# add custom docker cleanup binary
-COPY ["barnacle/barnacle", "/usr/local/bin/"]
-
 #
 # END: DOCKER IN DOCKER SETUP
 #

images/bootstrap/cloudbuild.yaml

@@ -1,17 +1,4 @@
 steps:
-  - name: golang:$_GO_VERSION
-    args:
-    - go
-    - build
-    - -o=/workspace/images/bootstrap/barnacle/barnacle
-    - ./images/bootstrap/barnacle/
-    env:
-    - CGO_ENABLED=0
-    - GOOS=linux
-    - GOARCH=amd64
-    - GO111MODULE=on
-    - GOPROXY=https://proxy.golang.org
-    - GOSUMDB=sum.golang.org
   - name: busybox
     args: ['cp', '-r', 'scenarios', './images/bootstrap/scenarios']
   - name: gcr.io/cloud-builders/docker

images/bootstrap/runner.sh

@@ -26,11 +26,11 @@ fi
 
 # runs custom docker data root cleanup binary and debugs remaining resources
 cleanup_dind() {
-    barnacle || true
-    # list what images and volumes remain
-    echo "Remaining docker images and volumes are:"
-    docker images --all || true
-    docker volume ls || true
+    if [[ "{DOCKER_IN_DOCKER_ENABLED:-false}" == "true" ]]; then
+        echo "Cleaning up after docker"
+        docker ps -aq | xargs -r docker rm -f || true
+        service docker stop || true
+    fi
     # cleanup binfmt_misc
     echo "Cleaning up binfmt_misc ..."
 }