Merge pull request #693 from droot/running/move-test-dir

Running/move test dir
kubernetes-sigs · May 13, 2019 · d427976 · d427976
2 parents b9d5db3 + 026adc1
commit d427976
Show file tree

Hide file tree

Showing 47 changed files with 42 additions and 99 deletions.
diff --git a/generated_golden.sh b/generated_golden.sh
@@ -30,22 +30,22 @@ build_kb() {
 scaffold_test_project() {
 	project=$1
 	version=$2
-    testdata_dir=$(pwd)/testdata
+	testdata_dir=$(pwd)/testdata
 	mkdir -p ./testdata/$project
 	rm -rf ./testdata/$project/*
 	pushd . 
 	cd testdata/$project
 
 	kb=$testdata_dir/../bin/kubebuilder
 
-    oldgopath=$GOPATH
+	oldgopath=$GOPATH
 	if [ $version == "1" ]; then
-        export GO111MODULE=auto
-        export GOPATH=$(pwd)/../.. # go ignores vendor under testdata, so fake out a gopath
-        # untar Gopkg.lock and vendor directory for appropriate project version
-        tar -zxf $testdata_dir/vendor.v$version.tgz
+		export GO111MODULE=auto
+		export GOPATH=$(pwd)/../.. # go ignores vendor under testdata, so fake out a gopath
+		# untar Gopkg.lock and vendor directory for appropriate project version
+		tar -zxf $testdata_dir/vendor.v$version.tgz
 
-        $kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors" --dep=false
+		$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors" --dep=false
 		$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
 		$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=create,update --make=false
 		$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=delete --make=false
@@ -57,11 +57,11 @@ scaffold_test_project() {
 		$kb alpha webhook --group core --version v1 --kind Namespace --type=mutating --operations=update --make=false
 		$kb create api --group policy --version v1beta1 --kind HealthCheckPolicy --example=false --controller=true --resource=true --namespaced=false --make=false
 	elif [ $version == "2" ]; then
-        export GO111MODULE=on
-        export PATH=$PATH:$(go env GOPATH)/bin
-        go mod init sigs.k8s.io/kubebuilder/testdata/project_v2  # our repo autodetection will traverse up to the kb module if we don't do this
+		export GO111MODULE=on
+		export PATH=$PATH:$(go env GOPATH)/bin
+		go mod init sigs.k8s.io/kubebuilder/testdata/project-v2  # our repo autodetection will traverse up to the kb module if we don't do this
 
-        $kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
+		$kb init --project-version $version --domain testproject.org --license apache2 --owner "The Kubernetes authors"
 		$kb create api --group crew --version v1 --kind Captain --controller=true --resource=true --make=false
 		$kb create api --group crew --version v1 --kind FirstMate --controller=true --resource=true --make=false
 		$kb alpha webhook --group crew --version v1 --kind FirstMate --type=mutating --operations=create,update --make=false
@@ -77,11 +77,11 @@ scaffold_test_project() {
 	rm -f Gopkg.lock
 	rm -rf ./vendor
 	rm -rf ./bin
-    export GOPATH=$oldgopath
+	export GOPATH=$oldgopath
 	popd
 }
 
 set -e
 build_kb
 scaffold_test_project gopath/src/project 1
-scaffold_test_project project_v2 2
+scaffold_test_project project-v2 2
diff --git a/pkg/scaffold/v2/manager/config.go b/pkg/scaffold/v2/manager/config.go
@@ -102,14 +102,5 @@ spec:
         - containerPort: 9876
           name: webhook-server
           protocol: TCP
-        volumeMounts:
-        - mountPath: /tmp/cert
-          name: cert
-          readOnly: true
       terminationGracePeriodSeconds: 10
-      volumes:
-      - name: cert
-        secret:
-          defaultMode: 420
-          secretName: webhook-server-secret
 `
diff --git a/pkg/scaffold/v2/webhook_manager_patch.go b/pkg/scaffold/v2/webhook_manager_patch.go
@@ -49,6 +49,15 @@ spec:
         - containerPort: 443
           name: webhook-server
           protocol: TCP
+        volumeMounts:
+        - mountPath: /tmp/cert
+          name: cert
+          readOnly: true
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: webhook-server-secret
 ---
 apiVersion: v1
 kind: Service

diff --git a/test.sh b/test.sh
@@ -154,6 +154,6 @@ go test ./cmd/... ./pkg/...
 GO111MODULE=auto test_project gopath/src/project 1
 
 # test project v2
-GO111MODULE=on test_project project_v2 2
+GO111MODULE=on test_project project-v2 2
 
 exit $rc
diff --git a/testdata/project_v2/.gitignore → testdata/project-v2/.gitignore b/testdata/project_v2/.gitignore → testdata/project-v2/.gitignore
diff --git a/testdata/project_v2/Dockerfile → testdata/project-v2/Dockerfile b/testdata/project_v2/Dockerfile → testdata/project-v2/Dockerfile
diff --git a/testdata/project_v2/Makefile → testdata/project-v2/Makefile b/testdata/project_v2/Makefile → testdata/project-v2/Makefile
diff --git a/testdata/project-v2/PROJECT b/testdata/project-v2/PROJECT
@@ -0,0 +1,3 @@
+version: "2"
+domain: testproject.org
+repo: sigs.k8s.io/kubebuilder/testdata/project-v2
diff --git a/testdata/project_v2/api/v1/captain_types.go → testdata/project-v2/api/v1/captain_types.go b/testdata/project_v2/api/v1/captain_types.go → testdata/project-v2/api/v1/captain_types.go
diff --git a/...data/project_v2/api/v1/firstmate_types.go → ...data/project-v2/api/v1/firstmate_types.go b/...data/project_v2/api/v1/firstmate_types.go → ...data/project-v2/api/v1/firstmate_types.go
diff --git a/...ta/project_v2/api/v1/groupversion_info.go → ...ta/project-v2/api/v1/groupversion_info.go b/...ta/project_v2/api/v1/groupversion_info.go → ...ta/project-v2/api/v1/groupversion_info.go
diff --git a/...roject_v2/api/v1/zz_generated.deepcopy.go → ...roject-v2/api/v1/zz_generated.deepcopy.go b/...roject_v2/api/v1/zz_generated.deepcopy.go → ...roject-v2/api/v1/zz_generated.deepcopy.go
diff --git a/...ct_v2/config/certmanager/certificate.yaml → ...ct-v2/config/certmanager/certificate.yaml b/...ct_v2/config/certmanager/certificate.yaml → ...ct-v2/config/certmanager/certificate.yaml
diff --git a/..._v2/config/certmanager/kustomization.yaml → ...-v2/config/certmanager/kustomization.yaml b/..._v2/config/certmanager/kustomization.yaml → ...-v2/config/certmanager/kustomization.yaml
diff --git a/...2/config/certmanager/kustomizeconfig.yaml → ...2/config/certmanager/kustomizeconfig.yaml b/...2/config/certmanager/kustomizeconfig.yaml → ...2/config/certmanager/kustomizeconfig.yaml
diff --git a/.../bases/crew.testproject.org_captains.yaml → .../bases/crew.testproject.org_captains.yaml b/.../bases/crew.testproject.org_captains.yaml → .../bases/crew.testproject.org_captains.yaml
diff --git a/...ases/crew.testproject.org_firstmates.yaml → ...ases/crew.testproject.org_firstmates.yaml b/...ases/crew.testproject.org_firstmates.yaml → ...ases/crew.testproject.org_firstmates.yaml
diff --git a/.../project_v2/config/crd/kustomization.yaml → .../project-v2/config/crd/kustomization.yaml b/.../project_v2/config/crd/kustomization.yaml → .../project-v2/config/crd/kustomization.yaml
diff --git a/...roject_v2/config/crd/kustomizeconfig.yaml → ...roject-v2/config/crd/kustomizeconfig.yaml b/...roject_v2/config/crd/kustomizeconfig.yaml → ...roject-v2/config/crd/kustomizeconfig.yaml
diff --git a/...onfig/crd/patches/webhook_in_captain.yaml → ...onfig/crd/patches/webhook_in_captain.yaml b/...onfig/crd/patches/webhook_in_captain.yaml → ...onfig/crd/patches/webhook_in_captain.yaml
diff --git a/...fig/crd/patches/webhook_in_firstmate.yaml → ...fig/crd/patches/webhook_in_firstmate.yaml b/...fig/crd/patches/webhook_in_firstmate.yaml → ...fig/crd/patches/webhook_in_firstmate.yaml
diff --git a/...ject_v2/config/default/kustomization.yaml → ...ject-v2/config/default/kustomization.yaml b/...ject_v2/config/default/kustomization.yaml → ...ject-v2/config/default/kustomization.yaml
@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: project_v2-system
+namespace: project-v2-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: project_v2-
+namePrefix: project-v2-
 
 # Labels to add to all resources and selectors.
 #commonLabels:

diff --git a/...fig/default/manager_auth_proxy_patch.yaml → ...fig/default/manager_auth_proxy_patch.yaml b/...fig/default/manager_auth_proxy_patch.yaml → ...fig/default/manager_auth_proxy_patch.yaml
diff --git a/...2/config/default/manager_image_patch.yaml → ...2/config/default/manager_image_patch.yaml b/...2/config/default/manager_image_patch.yaml → ...2/config/default/manager_image_patch.yaml
diff --git a/...ult/manager_prometheus_metrics_patch.yaml → ...ult/manager_prometheus_metrics_patch.yaml b/...ult/manager_prometheus_metrics_patch.yaml → ...ult/manager_prometheus_metrics_patch.yaml
diff --git a/...config/default/manager_webhook_patch.yaml → ...config/default/manager_webhook_patch.yaml b/...config/default/manager_webhook_patch.yaml → ...config/default/manager_webhook_patch.yaml
@@ -12,6 +12,15 @@ spec:
         - containerPort: 443
           name: webhook-server
           protocol: TCP
+        volumeMounts:
+        - mountPath: /tmp/cert
+          name: cert
+          readOnly: true
+      volumes:
+      - name: cert
+        secret:
+          defaultMode: 420
+          secretName: webhook-server-secret
 ---
 apiVersion: v1
 kind: Service

diff --git a/...fig/default/webhookcainjection_patch.yaml → ...fig/default/webhookcainjection_patch.yaml b/...fig/default/webhookcainjection_patch.yaml → ...fig/default/webhookcainjection_patch.yaml
diff --git a/...ject_v2/config/manager/kustomization.yaml → ...ject-v2/config/manager/kustomization.yaml b/...ject_v2/config/manager/kustomization.yaml → ...ject-v2/config/manager/kustomization.yaml
diff --git a/...ta/project_v2/config/manager/manager.yaml → ...ta/project-v2/config/manager/manager.yaml b/...ta/project_v2/config/manager/manager.yaml → ...ta/project-v2/config/manager/manager.yaml
@@ -60,13 +60,4 @@ spec:
         - containerPort: 9876
           name: webhook-server
           protocol: TCP
-        volumeMounts:
-        - mountPath: /tmp/cert
-          name: cert
-          readOnly: true
       terminationGracePeriodSeconds: 10
-      volumes:
-      - name: cert
-        secret:
-          defaultMode: 420
-          secretName: webhook-server-secret
diff --git a/...oject_v2/config/rbac/auth_proxy_role.yaml → ...oject-v2/config/rbac/auth_proxy_role.yaml b/...oject_v2/config/rbac/auth_proxy_role.yaml → ...oject-v2/config/rbac/auth_proxy_role.yaml
diff --git a/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml b/.../config/rbac/auth_proxy_role_binding.yaml → .../config/rbac/auth_proxy_role_binding.yaml
diff --git a/...ct_v2/config/rbac/auth_proxy_service.yaml → ...ct-v2/config/rbac/auth_proxy_service.yaml b/...ct_v2/config/rbac/auth_proxy_service.yaml → ...ct-v2/config/rbac/auth_proxy_service.yaml
diff --git a/...project_v2/config/rbac/kustomization.yaml → ...project-v2/config/rbac/kustomization.yaml b/...project_v2/config/rbac/kustomization.yaml → ...project-v2/config/rbac/kustomization.yaml
diff --git a/testdata/project_v2/config/rbac/role.yaml → testdata/project-v2/config/rbac/role.yaml b/testdata/project_v2/config/rbac/role.yaml → testdata/project-v2/config/rbac/role.yaml
diff --git a/.../project_v2/config/rbac/role_binding.yaml → .../project-v2/config/rbac/role_binding.yaml b/.../project_v2/config/rbac/role_binding.yaml → .../project-v2/config/rbac/role_binding.yaml
diff --git a/...ct_v2/config/samples/crew_v1_captain.yaml → ...ct-v2/config/samples/crew_v1_captain.yaml b/...ct_v2/config/samples/crew_v1_captain.yaml → ...ct-v2/config/samples/crew_v1_captain.yaml
diff --git a/..._v2/config/samples/crew_v1_firstmate.yaml → ...-v2/config/samples/crew_v1_firstmate.yaml b/..._v2/config/samples/crew_v1_firstmate.yaml → ...-v2/config/samples/crew_v1_firstmate.yaml
diff --git a/...ject_v2/config/webhook/kustomization.yaml → ...ject-v2/config/webhook/kustomization.yaml b/...ject_v2/config/webhook/kustomization.yaml → ...ject-v2/config/webhook/kustomization.yaml
diff --git a/...ct_v2/config/webhook/kustomizeconfig.yaml → ...ct-v2/config/webhook/kustomizeconfig.yaml b/...ct_v2/config/webhook/kustomizeconfig.yaml → ...ct-v2/config/webhook/kustomizeconfig.yaml
diff --git a/...ject_v2/controllers/captain_controller.go → ...ject-v2/controllers/captain_controller.go b/...ject_v2/controllers/captain_controller.go → ...ject-v2/controllers/captain_controller.go
@@ -23,7 +23,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	crewv1 "sigs.k8s.io/kubebuilder/testdata/project_v2/api/v1"
+	crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v2/api/v1"
 )
 
 // CaptainReconciler reconciles a Captain object

diff --git a/...ct_v2/controllers/firstmate_controller.go → ...ct-v2/controllers/firstmate_controller.go b/...ct_v2/controllers/firstmate_controller.go → ...ct-v2/controllers/firstmate_controller.go
@@ -23,7 +23,7 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	crewv1 "sigs.k8s.io/kubebuilder/testdata/project_v2/api/v1"
+	crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v2/api/v1"
 )
 
 // FirstMateReconciler reconciles a FirstMate object

diff --git a/...ct_v2/controllers/namespace_controller.go → ...ct-v2/controllers/namespace_controller.go b/...ct_v2/controllers/namespace_controller.go → ...ct-v2/controllers/namespace_controller.go
diff --git a/testdata/project_v2/go.mod → testdata/project-v2/go.mod b/testdata/project_v2/go.mod → testdata/project-v2/go.mod
@@ -1,4 +1,4 @@
-module sigs.k8s.io/kubebuilder/testdata/project_v2
+module sigs.k8s.io/kubebuilder/testdata/project-v2
 
 go 1.12
 
@@ -8,5 +8,4 @@ require (
 	k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628
 	k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4
 	sigs.k8s.io/controller-runtime v0.2.0-alpha.0.0.20190503051552-b666157c41da
-	sigs.k8s.io/controller-tools v0.2.0-alpha.1 // indirect
 )
diff --git a/testdata/project_v2/go.sum → testdata/project-v2/go.sum b/testdata/project_v2/go.sum → testdata/project-v2/go.sum
@@ -4,7 +4,6 @@ github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30 h1:Kn3rqvbUFqSe
 github.com/appscode/jsonpatch v0.0.0-20190108182946-7c0e3b262f30/go.mod h1:4AJxUpXUhv4N+ziTvIcWWXgeorXpxPZOfk9HdEVr96M=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/evanphx/json-patch v4.0.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -18,13 +17,8 @@ github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54=
 github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
-github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ=
-github.com/gobuffalo/envy v1.6.15 h1:OsV5vOpHYUpP7ZLS6sem1y40/lNX1BZj+ynMiRi21lQ=
-github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
 github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 h1:u4bArs140e9+AfE52mFHOXVFnOSBJBRlzTHrOPLOIhE=
 github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
@@ -43,34 +37,18 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.5 h1:gL2yXlmiIo4+t+y32d4WGwOjKGYcGOuyrg46vadswDE=
 github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g=
-github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/onsi/ginkgo v1.6.0 h1:Ix8l273rp3QzYgXSR+c8d1fTG7UPgYkOSELPhiY/YGw=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.1 h1:PZSj/UFNaVp3KxrzHOcS7oyuWA7LoOY/77yCTEFu21U=
 github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c h1:MUyE44mTvnI5A0xrxIxaMqoWFzPfQvtE2IWUollMDMs=
 github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
@@ -87,19 +65,10 @@ github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e h1:n/3MEhJQjQxrO
 github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273 h1:agujYaXJSxSo18YNX3jzl+4G6Bstwt+kqv47GS12uL0=
 github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.2.2 h1:J7U/N7eRtzjhs26d6GqMh2HBuXP8/Z64Densiiieafo=
-github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.2 h1:Fy0orTDgHdbnzHcsOgfCN4LtHf0ec3wwtiwJqwvf3Gc=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
@@ -108,41 +77,22 @@ go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac h1:7d7lG9fHOLdL6jZPtnV4LpI41SbohIJ1Atq7U991dMg=
 golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20180821023952-922f4815f713 h1:rMJUcaDGbG+X967I4zGKCq5laYqcGKJmpB+3jhpOhPw=
 golang.org/x/net v0.0.0-20180821023952-922f4815f713/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09 h1:KaQtG+aDELoNmXYas3TVkGNYRuq8JQ1aa7LJt8EXVyo=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc h1:MeuS1UDyZyFH++6vVy44PuufTeFF0d0nfI6XB87YGSk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872 h1:cGjJzUd8RgBw428LXP65YXni0aiGNA4Bl+ls8SmLOm8=
-golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 h1:+DCIGbF/swA92ohVg0//6X2IVY3KZs6p9mix0ziNYJM=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190501045030-23463209683d h1:D7DVZUZEUgsSIDTivnUtVeGfN5AvhDIKtdIZAqx0ieE=
-golang.org/x/tools v0.0.0-20190501045030-23463209683d/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 google.golang.org/appengine v1.1.0 h1:igQkv0AAhEIvTEpD5LIpAfav2eeVO9HBTjvKHVJPRSs=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
@@ -151,8 +101,6 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
 k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
 k8s.io/apiextensions-apiserver v0.0.0-20190228180357-d002e88f6236 h1:JfFtjaElBIgYKCWEtYQkcNrTpW+lMO4GJy8NP6SVQmM=
@@ -163,14 +111,10 @@ k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4 h1:aE8wOCKuoRs2aU0OP/Rz8SXiA
 k8s.io/client-go v0.0.0-20190228174230-b40b2a5939e4/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
 k8s.io/klog v0.1.0 h1:I5HMfc/DtuVaGR1KPwUrTc476K8NCqNBldC7H4dYEzk=
 k8s.io/klog v0.1.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v0.2.0 h1:0ElL0OHzF3N+OhoJTL0uca20SxtYt4X4+bzHeqrB83c=
-k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c h1:3KSCztE7gPitlZmWbNwue/2U0YruD65DqX3INopDAQM=
 k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 sigs.k8s.io/controller-runtime v0.2.0-alpha.0.0.20190503051552-b666157c41da h1:7XzBPKPYDxQoOp23vyDUvbSQElLLF3fWYHOnkx4UBVw=
 sigs.k8s.io/controller-runtime v0.2.0-alpha.0.0.20190503051552-b666157c41da/go.mod h1:ZhRyBoolVft3xZ8pUyJR3UgOyF3RUwQJwuUyaUXhBJc=
-sigs.k8s.io/controller-tools v0.2.0-alpha.1 h1:WAFYSisW4Nmp/WPCs40FfkmGMglf+QauHB8mWPpYqxM=
-sigs.k8s.io/controller-tools v0.2.0-alpha.1/go.mod h1:iog+z/LWZwDaOb2rfxUBZsTTPbloVgyVdXMye0kg8H8=
 sigs.k8s.io/testing_frameworks v0.1.1 h1:cP2l8fkA3O9vekpy5Ks8mmA0NW/F7yBdXf8brkWhVrs=
 sigs.k8s.io/testing_frameworks v0.1.1/go.mod h1:VVBKrHmJ6Ekkfz284YKhQePcdycOzNH9qL6ht1zEr/U=
 sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=

diff --git a/testdata/project_v2/hack/boilerplate.go.txt → testdata/project-v2/hack/boilerplate.go.txt b/testdata/project_v2/hack/boilerplate.go.txt → testdata/project-v2/hack/boilerplate.go.txt
diff --git a/testdata/project_v2/main.go → testdata/project-v2/main.go b/testdata/project_v2/main.go → testdata/project-v2/main.go
@@ -25,8 +25,8 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	crewv1 "sigs.k8s.io/kubebuilder/testdata/project_v2/api/v1"
-	"sigs.k8s.io/kubebuilder/testdata/project_v2/controllers"
+	crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v2/api/v1"
+	"sigs.k8s.io/kubebuilder/testdata/project-v2/controllers"
 	// +kubebuilder:scaffold:imports
 )