From 1cb3deba7ad6b0df8eed27d722aaf76a389f9489 Mon Sep 17 00:00:00 2001
From: Vince Prignano <vincepri@vmware.com>
Date: Thu, 20 Jun 2019 11:44:50 -0700
Subject: [PATCH] Update controller-tools to 0.1.11 (#1053)

Signed-off-by: Vince Prignano <vincepri@vmware.com>
---
 Gopkg.lock                                                 | 6 +++---
 Gopkg.toml                                                 | 2 +-
 Makefile                                                   | 3 ---
 .../controller-tools/cmd/controller-gen/main.go            | 7 ++-----
 vendor/sigs.k8s.io/controller-tools/pkg/rbac/manifests.go  | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index ae56953e089f..9cdce90d8614 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1196,7 +1196,7 @@
   version = "v0.1.12"
 
 [[projects]]
-  digest = "1:77a19ea61ca4e01817ad2bc3e91689c5097b4b439668127d1fb5d8b95c3aca03"
+  digest = "1:767ce3278b1fe82e3c713bc701b1ada60c8b9301213472c73f65a8955dec8980"
   name = "sigs.k8s.io/controller-tools"
   packages = [
     "cmd/controller-gen",
@@ -1210,8 +1210,8 @@
     "pkg/webhook",
   ]
   pruneopts = "UT"
-  revision = "b8adde9bc6d7f3fba449d306613a9daed23676c8"
-  version = "v0.1.10"
+  revision = "464fbed97efaced33902e262f09c5eae7315c3e3"
+  version = "v0.1.11"
 
 [[projects]]
   digest = "1:9070222ca967d09b3966552a161dd4420d62315964bf5e1efd8cc4c7c30ebca8"
diff --git a/Gopkg.toml b/Gopkg.toml
index bdb70f41c2fb..aca24451b642 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -28,7 +28,7 @@ required = [
 
 [[constraint]]
   name = "sigs.k8s.io/controller-tools"
-  version = "v0.1.10"
+  version = "v0.1.11"
 
 [[constraint]]
   name = "k8s.io/code-generator"
diff --git a/Makefile b/Makefile
index 660efc9cd2e7..2e0ec35c303a 100644
--- a/Makefile
+++ b/Makefile
@@ -72,9 +72,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
-	# 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/
 
diff --git a/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go b/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go
index 74c29d21d998..b28113ec0604 100644
--- a/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go
+++ b/vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go
@@ -155,11 +155,8 @@ Usage:
 			fmt.Printf("CRD manifests generated under '%s' \n", crdGen.OutputDir)
 
 			// RBAC generation
-			rbacOptions := &rbac.ManifestOptions{
-				InputDir:  filepath.Join(projectDir, "pkg"),
-				OutputDir: filepath.Join(projectDir, "config", "rbac"),
-				Name:      "manager",
-			}
+			rbacOptions := &rbac.ManifestOptions{}
+			rbacOptions.SetDefaults()
 			if err := rbac.Generate(rbacOptions); err != nil {
 				log.Fatal(err)
 			}
diff --git a/vendor/sigs.k8s.io/controller-tools/pkg/rbac/manifests.go b/vendor/sigs.k8s.io/controller-tools/pkg/rbac/manifests.go
index 629480ec1b5c..5800fbeb84d3 100644
--- a/vendor/sigs.k8s.io/controller-tools/pkg/rbac/manifests.go
+++ b/vendor/sigs.k8s.io/controller-tools/pkg/rbac/manifests.go
@@ -57,7 +57,7 @@ func (o *ManifestOptions) RoleName() string {
 // RoleFileName returns the name of the manifest file to use for the role.
 func (o *ManifestOptions) RoleFileName() string {
 	if len(o.RoleFile) == 0 {
-		return o.Name + "_role.yaml"
+		return "rbac_role.yaml"
 	}
 	// TODO: validate file name
 	return o.RoleFile
@@ -71,7 +71,7 @@ func (o *ManifestOptions) RoleBindingName() string {
 // RoleBindingFileName returns the name of the manifest file to use for the role binding.
 func (o *ManifestOptions) RoleBindingFileName() string {
 	if len(o.BindingFile) == 0 {
-		return o.Name + "_role_binding.yaml"
+		return "rbac_role_binding.yaml"
 	}
 	// TODO: validate file name
 	return o.BindingFile