From 83c2382e7c96645f7f8d608db45aef434872df92 Mon Sep 17 00:00:00 2001
From: Steve Kriss <krisss@vmware.com>
Date: Wed, 8 Jan 2020 15:26:00 -0700
Subject: [PATCH] bind-mount velero in outside GOPATH for clarity

Signed-off-by: Steve Kriss <krisss@vmware.com>
---
 Makefile                          | 10 +++++++---
 hack/update-generated-crd-code.sh |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 67b589d9e..e5e5ecda9 100644
--- a/Makefile
+++ b/Makefile
@@ -135,18 +135,22 @@ BUILDER_IMAGE := velero-builder
 
 # Example: make shell CMD="date > datefile"
 shell: build-dirs build-image
+	@# bind-mount the Velero root dir in at /github.com/vmware-tanzu/velero
+	@# because the Kubernetes code-generator tools require the project to
+	@# exist in a directory hierarchy ending like this (but *NOT* necessarily
+	@# under $GOPATH).
 	@docker run \
 		-e GOFLAGS \
 		-i $(TTY) \
 		--rm \
 		-u $$(id -u):$$(id -g) \
+		-v "$$(pwd):/github.com/vmware-tanzu/velero:delegated" \
+		-v "$$(pwd)/_output/bin:/output:delegated" \
 		-v "$$(pwd)/.go/pkg:/go/pkg:delegated" \
 		-v "$$(pwd)/.go/std:/go/std:delegated" \
-		-v "$$(pwd):/go/src/$(PKG):delegated" \
-		-v "$$(pwd)/_output/bin:/output:delegated" \
 		-v "$$(pwd)/.go/std/$(GOOS)/$(GOARCH):/usr/local/go/pkg/$(GOOS)_$(GOARCH)_static:delegated" \
 		-v "$$(pwd)/.go/go-build:/.cache/go-build:delegated" \
-		-w /go/src/$(PKG) \
+		-w /github.com/vmware-tanzu/velero \
 		$(BUILDER_IMAGE) \
 		/bin/sh $(CMD)
 
diff --git a/hack/update-generated-crd-code.sh b/hack/update-generated-crd-code.sh
index 34bcd1d65..0873ca447 100755
--- a/hack/update-generated-crd-code.sh
+++ b/hack/update-generated-crd-code.sh
@@ -19,6 +19,8 @@ set -o nounset
 set -o pipefail
 set -o xtrace
 
+# this script expects to be run from the root of the Velero repo.
+
 if [[ -z "${GOPATH}" ]]; then
   GOPATH=~/go
 fi
@@ -38,12 +40,13 @@ ${GOPATH}/src/k8s.io/code-generator/generate-groups.sh \
   github.com/vmware-tanzu/velero/pkg/generated \
   github.com/vmware-tanzu/velero/pkg/apis \
   "velero:v1" \
-  --go-header-file ${GOPATH}/src/github.com/vmware-tanzu/velero/hack/boilerplate.go.txt \
+  --go-header-file ./hack/boilerplate.go.txt \
+  --output-base ../../.. \
   $@
 
 controller-gen \
   crd:crdVersions=v1beta1,preserveUnknownFields=false \
-  output:dir=pkg/generated/crds/manifests \
+  output:dir=./pkg/generated/crds/manifests \
   paths=./pkg/apis/velero/v1/...
 
 go generate ./pkg/generated/crds