Update controller-{runtime, tools} / Kubernetes 1.12 (#630)

* Update controller-runtime and controller-tools to latest release

Signed-off-by: Vince Prignano <[email protected]>

* Update Dockerfile golang version to 1.11.2

Signed-off-by: Vince Prignano <[email protected]>

* Remove outdated sed from makefile target

Signed-off-by: Vince Prignano <[email protected]>

* Update crds definition after running latest controller-tools

Signed-off-by: Vince Prignano <[email protected]>

* Update controller-runtime and tools versions

Signed-off-by: Vince Prignano <[email protected]>

Author: vincepri

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.10.3 as builder
+FROM golang:1.11.2 as builder
 
 # Copy in the go src
 WORKDIR $GOPATH/src/sigs.k8s.io/cluster-api

Gopkg.lock

@@ -57,10 +57,6 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~
 .PHONY: manifests
 manifests: ## Generate manifests e.g. CRD, RBAC etc.
 	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
-	@# Kubebuilder CRD generation can't handle intstr.IntOrString properly:
-	@# https://github.com/kubernetes-sigs/kubebuilder/issues/442
-	sed -i -e 's/maxSurge:/maxSurge: {}/g' -e '/maxSurge:/{n;d};' config/crds/cluster_v1alpha1_machinedeployment.yaml
-	sed -i -e 's/maxUnavailable:/maxUnavailable: {}/g' -e '/maxUnavailable:/{n;d};' config/crds/cluster_v1alpha1_machinedeployment.yaml
 
 .PHONY: fmt
 fmt: ## Run go fmt against code

Makefile

@@ -48,8 +48,14 @@ spec:
               properties:
                 rollingUpdate:
                   properties:
-                    maxSurge: {}
-                    maxUnavailable: {}
+                    maxSurge:
+                      oneOf:
+                      - type: string
+                      - type: integer
+                    maxUnavailable:
+                      oneOf:
+                      - type: string
+                      - type: integer
                   type: object
                 type:
                   type: string