Fix generated RBAC manifests defaults

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

cmd/controller-gen/main.go

@@ -34,9 +34,9 @@ func main() {
 		Long:  `A reference implementation generation tool for Kubernetes APIs.`,
 		Example: `	# Generate RBAC manifests for a project
 	controller-gen rbac
-	
+
 	# Generate CRD manifests for a project
-	controller-gen crd 
+	controller-gen crd
 
 	# Run all the generators for a given project
 	controller-gen all
@@ -155,7 +155,10 @@ Usage:
 			fmt.Printf("CRD manifests generated under '%s' \n", crdGen.OutputDir)
 
 			// RBAC generation
-			rbacOptions := &rbac.ManifestOptions{}
+			rbacOptions := &rbac.ManifestOptions{
+				InputDir:  filepath.Join(projectDir, "pkg"),
+				OutputDir: filepath.Join(projectDir, "config", "rbac"),
+			}
 			rbacOptions.SetDefaults()
 			if err := rbac.Generate(rbacOptions); err != nil {
 				log.Fatal(err)

pkg/rbac/manifests.go

@@ -42,11 +42,21 @@ type ManifestOptions struct {
 
 // SetDefaults sets up the default options for RBAC Manifest generator.
 func (o *ManifestOptions) SetDefaults() {
-	o.Name = "manager"
-	o.InputDir = filepath.Join(".", "pkg")
-	o.OutputDir = filepath.Join(".", "config", "rbac")
-	o.ServiceAccount = "default"
-	o.Namespace = "system"
+	if o.Name == "" {
+		o.Name = "manager"
+	}
+	if o.InputDir == "" {
+		o.InputDir = filepath.Join(".", "pkg")
+	}
+	if o.OutputDir == "" {
+		o.OutputDir = filepath.Join(".", "config", "rbac")
+	}
+	if o.ServiceAccount == "" {
+		o.ServiceAccount = "default"
+	}
+	if o.Namespace == "" {
+		o.Namespace = "system"
+	}
 }
 
 // RoleName returns the RBAC role name to be used in the manifests.