removing trash from the repo (#37470)

.dockerignore

@@ -2,7 +2,6 @@
 ./.dapper
 ./build
 ./dist
-./.trash-cache
 ./.idea
 ./default.etcd
 ./package/rancher

.gitignore

@@ -4,8 +4,6 @@ vendor
 /dist
 /build
 *.swp
-/.trash-cache
-/trash.lock
 /.idea
 /cmd/agent/agent
 /package/data.json

Dockerfile-windows-20h2.dapper

@@ -51,7 +51,6 @@ ENV DAPPER_ENV REPO TAG DRONE_TAG FOSSA_API_KEY
 ENV DAPPER_SOURCE /gopath/src/github.com/rancher/rancher
 ENV DAPPER_OUTPUT ./bin
 ENV DAPPER_DOCKER_SOCKET true
-ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
 ENV HOME ${DAPPER_SOURCE}
 
 WORKDIR ${DAPPER_SOURCE}

Dockerfile-windows.dapper

@@ -51,7 +51,6 @@ ENV DAPPER_ENV REPO TAG DRONE_TAG FOSSA_API_KEY
 ENV DAPPER_SOURCE /gopath/src/github.com/rancher/rancher
 ENV DAPPER_OUTPUT ./bin
 ENV DAPPER_DOCKER_SOCKET true
-ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
 ENV HOME ${DAPPER_SOURCE}
 
 WORKDIR ${DAPPER_SOURCE}

Dockerfile.dapper

@@ -136,7 +136,6 @@ ENV DAPPER_SOURCE /go/src/github.com/rancher/rancher/
 ENV DAPPER_OUTPUT ./bin ./dist ./go.mod ./go.sum ./pkg/apis/go.mod ./pkg/apis/go.sum ./pkg/client/go.mod ./pkg/client/go.sum ./scripts/package ./pkg/settings/setting.go ./package/Dockerfile
 ENV DAPPER_DOCKER_SOCKET true
 ENV DAPPER_RUN_ARGS "-v rancher2-go16-pkg-1:/go/pkg -v rancher2-go16-cache-1:/root/.cache/go-build --privileged"
-ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache
 ENV GOCACHE /root/.cache/go-build
 ENV HOME ${DAPPER_SOURCE}
 VOLUME /var/lib/rancher

Makefile

@@ -15,14 +15,6 @@ TARGETS := $(shell ls scripts)
 $(TARGETS): .dapper
 	./.dapper $@
 
-trash: .dapper
-	./.dapper -m bind trash
-
-trash-keep: .dapper
-	./.dapper -m bind trash -k
-
-deps: trash
-
 .DEFAULT_GOAL := ci
 
 .PHONY: $(TARGETS)

make.bat

@@ -1,12 +1,4 @@
 @echo off
-if "%1%"=="trash" (
-    call :trash
-    goto :eof
-)
-if "%1%"=="trash-keep" (
-    call :trash-keep
-    goto :eof
-)
 if "%1%"=="deps" (
     call :deps
     goto :eof
@@ -26,17 +18,3 @@ if not exist .dapper.exe (
     .dapper.exe -v
 )
 goto :eof
-
-:trash
-call :.dapper
-.dapper.exe -f Dockerfile-windows.dapper -m bind trash.exe
-goto :eof
-
-:trash-keep
-call :.dapper
-.dapper.exe -f Dockerfile-windows.dapper -m bind trash.exe -k
-goto :eof
-
-:deps
-call :trash
-goto :eof

pkg/kontainer-engine/scripts/test

@@ -5,7 +5,7 @@ cd $(dirname $0)/..
 
 echo Running tests
 
-PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} |  cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
+PACKAGES=". $(find -name '*.go' | xargs -I{} dirname {} |  cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
 
 [ "${ARCH}" == "amd64" ] && RACE=-race
 go test ${RACE} -cover -tags=test ${PACKAGES}

pkg/kontainer-engine/scripts/validate

@@ -5,7 +5,7 @@ cd $(dirname $0)/..
 
 echo Running validation
 
-PACKAGES=". $(find . -name '*.go' | xargs -I{} dirname {} |  cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|.trash-cache|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
+PACKAGES=". $(find . -name '*.go' | xargs -I{} dirname {} |  cut -f2 -d/ | sort -u | grep -Ev '(^\.$|.git|vendor|bin)' | sed -e 's!^!./!' -e 's!$!/...!')"
 
 echo Running: go vet
 go vet ${PACKAGES}

scripts/copy-hyperkube.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e -x
-
-cd $(dirname $0)/..
-
-trash -k
-
-rm -rf pkg/hyperkube
-cp -rf vendor/k8s.io/kubernetes/cmd/hyperkube pkg/hyperkube
-sed -i 's/package main/package hyperkube/g' pkg/hyperkube/*.go
-
-trash