Merge branch 'master' of github.com:kubernetes-sigs/kubebuilder into …

…makeenv

docs/book/install-and-build.sh

@@ -60,9 +60,9 @@ esac
 
 # grab mdbook
 # we hardcode linux/amd64 since rust uses a different naming scheme and it's a pain to tran
-echo "downloading mdBook-v0.3.1-${arch}-${target}.${ext}"
+echo "downloading mdBook-v0.4.2-${arch}-${target}.${ext}"
 set -x
-curl -sL -o /tmp/mdbook.${ext} https://github.com/rust-lang-nursery/mdBook/releases/download/v0.3.1/mdBook-v0.3.1-${arch}-${target}.${ext}
+curl -sL -o /tmp/mdbook.${ext} https://github.com/rust-lang-nursery/mdBook/releases/download/v0.4.2/mdBook-v0.4.2-${arch}-${target}.${ext}
 ${cmd} /tmp/mdbook.${ext}
 chmod +x /tmp/mdbook
 

docs/book/src/404.md

@@ -0,0 +1 @@
+TODO.md

docs/book/src/SUMMARY.md

@@ -77,6 +77,7 @@
   - [Configuring EnvTest](./reference/envtest.md)
 
   - [Metrics](./reference/metrics.md)
+  - [Makefile Helpers](makefile-helpers.md)
 
 ---
 

docs/book/src/TODO.md

@@ -1,7 +1,8 @@
 # TODO
 
 If you're seeing this page, it's probably because something's not done in
-the book yet.  Go [see if anyone else has found
+the book yet, or you stumbled upon an old link.  Go [see if anyone else
+has found
 this](https://github.com/kubernetes-sigs/kubebuilder/issues?q=is%3Aopen+is%3Aissue+label%3Akind%2Fdocumentation)
 or [bug the
 maintainers](https://github.com/kubernetes-sigs/kubebuilder/issues/new?assignees=&labels=kind%2Fdocumentation).

docs/book/src/cronjob-tutorial/running-webhook.md

@@ -12,7 +12,7 @@ Why?
 
 ## Cert Manager
 
-You need follow [this](./cert-manager.md) to install the cert manager bundle.
+You need to follow [this](./cert-manager.md) to install the cert manager bundle.
 
 ## Build your image
 

docs/book/src/migration/guide.md

@@ -12,7 +12,7 @@ project that looks like a native v2 project. However, in some cases, it's
 possible to do an in-place upgrade (i.e. reuse the v1 project layout, upgrading
 controller-runtime and controller-tools.  
 
-Let's take the [example v1 project][v1-project] and migrate it to Kubebuilder
+Let's take as example an V1 project and migrate it to Kubebuilder
 v2. At the end, we should have something that looks like the
 [example v2 project][v2-project].
 
@@ -215,6 +215,5 @@ Change the image name in the Makefile if needed.
 Finally, we can run `make` and `make docker-build` to ensure things are working
 fine.
 
-[v1-project]: https://github.com/kubernetes-sigs/kubebuilder/tree/master/docs/book/src/migration/testdata/gopath/project-v1
 [v2-project]: https://github.com/kubernetes-sigs/kubebuilder/tree/master/docs/book/src/cronjob-tutorial/testdata/project
 [builtin-type-example]: https://sigs.k8s.io/controller-runtime/examples/builtins