Update generated files, add workaround for controller-tools (kubernet…

…es-sigs#1050)

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

.gitignore

@@ -38,7 +38,7 @@ docs/book/node_modules/
 *.tmp
 
 # rbac and manager config for example provider
-config/ci/rbac/rbac_role_binding.yaml
-config/ci/rbac/rbac_role.yaml
+config/ci/rbac/manager_role_binding.yaml
+config/ci/rbac/manager_role.yaml
 config/ci/manager/manager.yaml
 

Makefile

@@ -72,7 +72,10 @@ 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
-	cp -f ./config/rbac/rbac*.yaml ./config/ci/rbac/
+	# TODO(vincepri) Remove this line. This is a workaround until
+	# https://github.com/kubernetes-sigs/controller-tools/pull/230 is merged.
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go rbac
+	cp -f ./config/rbac/manager*.yaml ./config/ci/rbac/
 	cp -f ./config/manager/manager*.yaml ./config/ci/manager/
 
 .PHONY: fmt

config/ci/rbac/kustomization.yaml

@@ -4,5 +4,5 @@
 # YAML string, with resources separated by document
 # markers ("---").
 resources:
-- rbac_role_binding.yaml
-- rbac_role.yaml
+- manager_role_binding.yaml
+- manager_role.yaml

config/crds/cluster_v1alpha1_machinedeployment.yaml

@@ -79,6 +79,9 @@ spec:
                     = RollingUpdate.
                   properties:
                     maxSurge:
+                      anyOf:
+                      - type: string
+                      - type: integer
                       description: 'The maximum number of machines that can be scheduled
                         above the desired number of machines. Value can be an absolute
                         number (ex: 5) or a percentage of desired machines (ex: 10%).
@@ -91,10 +94,10 @@ spec:
                         new MachineSet can be scaled up further, ensuring that total
                         number of machines running at any time during the update is
                         at most 130% of desired machines.'
-                      oneOf:
+                    maxUnavailable:
+                      anyOf:
                       - type: string
                       - type: integer
-                    maxUnavailable:
                       description: 'The maximum number of machines that can be unavailable
                         during the update. Value can be an absolute number (ex: 5)
                         or a percentage of desired machines (ex: 10%). Absolute number
@@ -106,9 +109,6 @@ spec:
                         down further, followed by scaling up the new MachineSet, ensuring
                         that the total number of machines available at all times during
                         the update is at least 70% of desired machines.'
-                      oneOf:
-                      - type: string
-                      - type: integer
                   type: object
                 type:
                   description: Type of deployment. Currently the only supported strategy

config/rbac/kustomization.yaml

@@ -4,6 +4,6 @@
 # YAML string, with resources separated by document
 # markers ("---").
 resources:
-- rbac_role_binding.yaml
-- rbac_role.yaml
+- manager_role_binding.yaml
+- manager_role.yaml
 

pkg/controller/noderef/BUILD.bazel

@@ -42,6 +42,7 @@ go_test(
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",