Allow setting controller name, fix default

This switches the default controller name in the builder to just
lower(<kind>) which fixes any issues that arrise from it showing up in
the deprecated metrics (which use the workqueue name as part of the
metric name).

It also allows overriding name in case of two controllers reconciling
the same type using the builder.

Author: DirectXMan12

pkg/builder/build.go

@@ -50,6 +50,7 @@ type Builder struct {
 	watchRequest   []watchRequest
 	config         *rest.Config
 	ctrl           controller.Controller
+	name           string
 }
 
 // SimpleController returns a new Builder.
@@ -131,6 +132,16 @@ func (blder *Builder) WithEventFilter(p predicate.Predicate) *Builder {
 	return blder
 }
 
+// Named sets the name of the controller to the given name.  The name shows up
+// in metrics, among other things, and thus should be a prometheus compatible name
+// (underscores and alphanumeric characters only).
+//
+// By default, controllers are named using the lowercase version of their kind.
+func (blder *Builder) Named(name string) *Builder {
+	blder.name = name
+	return blder
+}
+
 // Complete builds the Application ControllerManagedBy.
 func (blder *Builder) Complete(r reconcile.Reconciler) error {
 	_, err := blder.Build(r)
@@ -227,12 +238,14 @@ func (blder *Builder) doManager() error {
 }
 
 func (blder *Builder) getControllerName() (string, error) {
+	if blder.name != "" {
+		return blder.name, nil
+	}
 	gvk, err := getGvk(blder.apiType, blder.mgr.GetScheme())
 	if err != nil {
 		return "", err
 	}
-	name := fmt.Sprintf("%s-application", strings.ToLower(gvk.Kind))
-	return name, nil
+	return strings.ToLower(gvk.Kind), nil
 }
 
 func (blder *Builder) doController(r reconcile.Reconciler) error {