make clean will remove all gitignored files

kiashok · Sep 4, 2017 · b6f6419 · b6f6419
1 parent 0a88323
commit b6f6419
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -120,5 +120,8 @@ zz_generated.openapi.go
 # This file used by some vendor repos (e.g. github.com/go-openapi/...) to store secret variables and should not be ignored
 !\.drone\.sec
 
+# Godeps workspace
+/Godeps/_workspace
+
 /bazel-*
 *.pyc
diff --git a/build/common.sh b/build/common.sh
@@ -409,8 +409,10 @@ function kube::build::clean() {
     "${DOCKER[@]}" rmi $("${DOCKER[@]}" images -q --filter 'dangling=true') 2> /dev/null || true
   fi
 
-  kube::log::status "Removing _output directory"
-  rm -rf "${LOCAL_OUTPUT_ROOT}"
+  if [[ -d "${LOCAL_OUTPUT_ROOT}" ]]; then
+    kube::log::status "Removing _output directory"
+    rm -rf "${LOCAL_OUTPUT_ROOT}"
+  fi
 }
 
 # Set up the context directory for the kube-build image and build it.

diff --git a/build/root/Makefile b/build/root/Makefile
@@ -309,10 +309,7 @@ clean:
 else
 clean: clean_meta
 	build/make-clean.sh
-	rm -rf $(OUT_DIR)
-	rm -rf Godeps/_workspace # Just until we are sure it is gone
-	# TODO(thockin): Remove this when we call clean_generated.
-	rm -f pkg/generated/openapi/zz_generated.openapi.go
+	git clean -Xdf
 endif
 
 define CLEAN_META_HELP_INFO