Fix multiversion tutorial

The multiversion tutorial had a couple of typos in it.  This fixes them.

Author: DirectXMan12

docs/book/src/cronjob-tutorial/cert-manager.md

@@ -5,7 +5,7 @@ provisioning the certificates for the webhook server. Other solutions should
 also work as long as they put the certificates in the desired location.
 
 You can follow
-[the cert manager document](https://docs.cert-manager.io/en/latest/getting-started/install/kubernetes.html)
+[the cert manager documentation](https://docs.cert-manager.io/en/latest/getting-started/install/kubernetes.html)
 to install it.
 
 Cert manager also has a component called CA injector, which is responsible for

docs/book/src/cronjob-tutorial/testdata/project/config/rbac/role.yaml

@@ -6,6 +6,18 @@ metadata:
   creationTimestamp: null
   name: manager-role
 rules:
+- apiGroups:
+  - batch
+  resources:
+  - jobs
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - batch
   resources:
@@ -32,15 +44,3 @@ rules:
   - get
   - patch
   - update
-- apiGroups:
-  - batch
-  resources:
-  - jobs
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch

docs/book/src/cronjob-tutorial/testdata/project/config/webhook/manifests.yaml

@@ -1,30 +1,4 @@
 
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: MutatingWebhookConfiguration
-metadata:
-  creationTimestamp: null
-  name: mutating-webhook-configuration
-webhooks:
-- clientConfig:
-    caBundle: Cg==
-    service:
-      name: webhook-service
-      namespace: system
-      path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
-  failurePolicy: Fail
-  name: mcronjob.kb.io
-  rules:
-  - apiGroups:
-    - batch.tutorial.kubebuilder.io
-    apiVersions:
-    - v1
-    operations:
-    - CREATE
-    - UPDATE
-    resources:
-    - cronjobs
-
 ---
 apiVersion: admissionregistration.k8s.io/v1beta1
 kind: ValidatingWebhookConfiguration

docs/book/src/multiversion-tutorial/deployment.md

@@ -7,7 +7,7 @@ bits disabled.  To enable them, we need to:
 
 - Enable `patches/webhook_in_<kind>.yaml` and
   `patches/cainjection_in_<kind>.yaml` in
-  `config/crds/kustomization.yaml` file.
+  `config/crd/kustomization.yaml` file.
 
 - Enable `../certmanager` and `../webhook` directories under the
   `bases` section in `config/default/kustomization.yaml` file.
@@ -18,6 +18,15 @@ bits disabled.  To enable them, we need to:
 - Enable all the vars under the `CERTMANAGER` section in
   `config/default/kustomization.yaml` file.
 
+Additionally, we'll need to set the `CRD_OPTIONS` variable to just
+`"crd"`, removing the `trivialVersions` option (this ensures that we
+actually [generate validation for each version][ref-multiver], instead of
+telling Kubernetes that they're the same):
+
+```makefile
+CRD_OPTIONS ?= "crd"
+```
+
 Now we have all our code changes and manifests in place, so let's deploy it to
 the cluster and test it out.
 
@@ -28,8 +37,9 @@ with
 [0.9.0-alpha.0](https://github.com/jetstack/cert-manager/releases/tag/v0.9.0-alpha.0)
 release.
 
-Once all our ducks are in a row with certificates, we can run `make deploy` (as normal)
-to deploy all the bits (i.e. the controller-manager deployment) onto the cluster.
+Once all our ducks are in a row with certificates, we can run `make
+install deploy` (as normal) to deploy all the bits (CRD,
+controller-manager deployment) onto the cluster.
 
 ## Testing
 
@@ -45,14 +55,14 @@ We'll make a v2 version based on our v1 version (put it under `config/samples`)
 Then, we can create it on the cluster: 
 
 ```shell
-kubectl apply -f config/samples/batch_v2_cronjob.yaml`
+kubectl apply -f config/samples/batch_v2_cronjob.yaml
 ```
 
 If we've done everything correctly, it should create successfully,
 and we should be able to fetch it using both the v2 resource
 
 ```shell
-kubectl get cronjobs.v2.tutorial.kubebuilder.io -o yaml
+kubectl get cronjobs.v2.batch.tutorial.kubebuilder.io -o yaml
 ```
 
 ```yaml
@@ -62,7 +72,7 @@ kubectl get cronjobs.v2.tutorial.kubebuilder.io -o yaml
 and the v1 resource
 
 ```shell
-kubectl get cronjobs.v1.tutorial.kubebuilder.io -o yaml
+kubectl get cronjobs.v1.batch.tutorial.kubebuilder.io -o yaml
 ```
 ```yaml
 {{#include ./testdata/project/config/samples/batch_v2_cronjob.yaml}}
@@ -76,3 +86,5 @@ reconcile, even though our controller is written against our v1 API version.
 
 ## Troubleshooting
 TODO(../TODO.md) steps for troubleshoting
+
+[ref-multiver]: /reference/generating-crd.md#multiple-versions "Generating CRDs: Multiple Versions"

docs/book/src/multiversion-tutorial/testdata/project/Dockerfile

@@ -0,0 +1,25 @@
+# Build the manager binary
+FROM golang:1.12.5 as builder
+
+WORKDIR /workspace
+# Copy the Go Modules manifests
+COPY go.mod go.mod
+COPY go.sum go.sum
+# cache deps before building and copying source so that we don't need to re-download as much
+# and so that source changes don't invalidate our downloaded layer
+RUN go mod download
+
+# Copy the go source
+COPY main.go main.go
+COPY api/ api/
+COPY controllers/ controllers/
+
+# Build
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go
+
+# Use distroless as minimal base image to package the manager binary
+# Refer to https://github.com/GoogleContainerTools/distroless for more details
+FROM gcr.io/distroless/static:latest
+WORKDIR /
+COPY --from=builder /workspace/manager .
+ENTRYPOINT ["/manager"]

docs/book/src/multiversion-tutorial/testdata/project/Dockerfile

@@ -0,0 +1,64 @@
+
+# Image URL to use all building/pushing image targets
+IMG ?= controller:latest
+# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
+CRD_OPTIONS ?= "crd"
+
+all: manager
+
+# Run tests
+test: generate fmt vet manifests
+	go test ./api/... ./controllers/... -coverprofile cover.out
+
+# Build manager binary
+manager: generate fmt vet
+	go build -o bin/manager main.go
+
+# Run against the configured Kubernetes cluster in ~/.kube/config
+run: generate fmt vet
+	go run ./main.go
+
+# Install CRDs into a cluster
+install: manifests
+	kubectl apply -f config/crd/bases
+
+# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
+deploy: manifests
+	kubectl apply -f config/crd/bases
+	kustomize build config/default | kubectl apply -f -
+
+# Generate manifests e.g. CRD, RBAC etc.
+manifests: controller-gen
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
+
+# Run go fmt against code
+fmt:
+	go fmt ./...
+
+# Run go vet against code
+vet:
+	go vet ./...
+
+# Generate code
+generate: controller-gen
+	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
+
+# Build the docker image
+docker-build: test
+	docker build . -t ${IMG}
+	@echo "updating kustomize image patch file for manager resource"
+	sed -i'' -e 's@image: .*@image: '"${IMG}"'@' ./config/default/manager_image_patch.yaml
+
+# Push the docker image
+docker-push:
+	docker push ${IMG}
+
+# find or download controller-gen
+# download controller-gen if necessary
+controller-gen:
+ifeq (, $(shell which controller-gen))
+	go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.0-beta.3
+CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
+else
+CONTROLLER_GEN=$(shell which controller-gen)
+endif

docs/book/src/multiversion-tutorial/testdata/project/Makefile

@@ -67,7 +67,7 @@ func (src *CronJob) ConvertTo(dstRaw conversion.Hub) error {
 	dst.Spec.Schedule = strings.Join(scheduleParts, " ")
 
 	/*
-	The rest of the conversion is pretty rote.
+		The rest of the conversion is pretty rote.
 	*/
 	// ObjectMeta
 	dst.ObjectMeta = src.ObjectMeta
@@ -109,13 +109,13 @@ func (dst *CronJob) ConvertFrom(srcRaw conversion.Hub) error {
 		return &part
 	}
 	dst.Spec.Schedule.Minute = partIfNeeded(schedParts[0])
-	dst.Spec.Schedule.Hour = partIfNeeded(schedParts[0])
-	dst.Spec.Schedule.DayOfMonth = partIfNeeded(schedParts[0])
-	dst.Spec.Schedule.Month = partIfNeeded(schedParts[0])
-	dst.Spec.Schedule.DayOfWeek = partIfNeeded(schedParts[0])
+	dst.Spec.Schedule.Hour = partIfNeeded(schedParts[1])
+	dst.Spec.Schedule.DayOfMonth = partIfNeeded(schedParts[2])
+	dst.Spec.Schedule.Month = partIfNeeded(schedParts[3])
+	dst.Spec.Schedule.DayOfWeek = partIfNeeded(schedParts[4])
 
 	/*
-	The rest of the conversion is pretty rote.
+		The rest of the conversion is pretty rote.
 	*/
 	// ObjectMeta
 	dst.ObjectMeta = src.ObjectMeta

docs/book/src/multiversion-tutorial/testdata/project/Makefile

@@ -39,8 +39,6 @@ We'll leave our spec largely unchanged, except to change the schedule field to a
 */
 // CronJobSpec defines the desired state of CronJob
 type CronJobSpec struct {
-	// +kubebuilder:validation:MinLength=0
-
 	// The schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.
 	Schedule CronSchedule `json:"schedule"`