Merge pull request #28421 from thockin/cleanup-godeps-transition

Automatic merge from submit-queue Cleanup a TODO from godeps -> vendor change This logs a false "error" message, so it's time to go. It was needed to ensure nobody has stale build images laying around, but that was quite a while ago, so it's probably safe now.

Merge pull request #28421 from thockin/cleanup-godeps-transition
feea3829 · k8s-merge-robot · GitHub · 2f9feef9 · 8fe8ec98 · feea3829
Commit feea3829 authored Jul 02, 2016 by k8s-merge-robot Committed by GitHub Jul 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

common.sh build/common.sh +0 -10

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -559,16 +559,6 @@ function kube::build::clean_images() {
 }

 function kube::build::ensure_data_container() {
-  # This is temporary, while last remnants of _workspace are obliterated.  If
-  # the data container exists it might be from before the change from
-  # Godeps/_workspace/ to vendor/, and thereby still have a Godeps/_workspace/
-  # directory in it, which trips up godep (yay godep!).  Once we are confident
-  # that this has run ~everywhere we care about, we can remove this.
-  # TODO(thockin): remove this after v1.3 is cut.
-  if "${DOCKER[@]}" inspect "${KUBE_BUILD_DATA_CONTAINER_NAME}" \
-      | grep -q "Godeps/_workspace/pkg"; then
-    docker rm -f "${KUBE_BUILD_DATA_CONTAINER_NAME}"
-  fi
  if ! "${DOCKER[@]}" inspect "${KUBE_BUILD_DATA_CONTAINER_NAME}" >/dev/null 2>&1; then
    kube::log::status "Creating data container"
    local -ra docker_cmd=(