Broker improvements api updates

Makefile

@@ -1,4 +1,4 @@
-TAG = 1.0.3
+TAG = 1.0.4
 DOCKERORG = quay.io/integreatly
 BROKER_IMAGE_NAME = managed-service-broker
 

README.md

@@ -42,6 +42,8 @@ $ oc process -f templates/broker.template.yaml \
  -p IMAGE_ORG=<yourDockerOrg> \
  -p CHE_DASHBOARD_URL=<cheDashBoardUrl> \
  -p LAUNCHER_DASHBOARD_URL=<launcherDashBoardUrl> \
+ -p THREESCALE_DASHBOARD_URL=<3scaleDashBoardUrl> \
+ -p APICURIO_DASHBOARD_URL=<apiCurioDashBoardUrl> \
  | oc create -f -
 
 # Verify that the broker has been registered correctly and STATUS is 'Ready'
@@ -51,7 +53,8 @@ $ svcat get brokers
 $ oc describe clusterservicebroker managed-service-broker
 ```
 
-__NOTE:__ Che and Launcher do not need to be deployed to deploy the managed-service-broker, `CHE_DASHBOARD_URL` and `LAUNCHER_DASHBOARD_URL` just need to be set to a non-empty value.
+__NOTE:__ The services requiring `X_DASHBOARD_URL` parameters do not need to be installed to run the broker, the parameters just need to be set to a non-empty value to deploy the template.
+
 #### Add syndesis-crd:
 
 ```
@@ -134,12 +137,17 @@ Setup the managed-service-broker as outlined in [Deploy managed-service-broker](
 ```bash
 # Set env vars for managed-service-broker url and API token.
 
+# Expose a route to the managed service broker
+$ oc expose svc/msb
+$ oc get route msb -o=jsonpath='{.status.ingress[0].host}'
+msb-managed-service-broker.127.0.0.1.nip.io
+
 # Get API token
 $ oc whoami -t
 EkoH4sIC1aTBWRBNeAzYfkMoMc36W2V3nqPigulKK-s
 
 $ export KUBERNETES_API_TOKEN=EkoH4sIC1aTBWRBNeAzYfkMoMc36W2V3nqPigulKK-s
-$ export BROKER_URL=http://msb-managed-service-broker.127.0.0.1.nip.io // Your managed-service-broker route/URL
+$ export BROKER_URL=http://msb-managed-service-broker.127.0.0.1.nip.io // Add protocol: http://....
 
 # If KUBERNETES_CONFIG is not already set.
 export KUBERNETES_CONFIG=~/.kube/config

cmd/broker/main.go

@@ -71,8 +71,6 @@ func runWithContext(ctx context.Context) error {
 		return nil
 	}
 
-	namespace := os.Getenv("POD_NAMESPACE")
-
 	addr := ":" + strconv.Itoa(options.Port)
 	var err error
 
@@ -88,25 +86,24 @@ func runWithContext(ctx context.Context) error {
 	k8sClient := k8sclient.GetKubeClient()
 	osClient := openshift.NewClientFactory(cfg)
 
-	ctrlr := controller.CreateController(namespace, k8sClient, osClient)
-
-
-
+	deployers := []controller.Deployer{}
 	if shouldRegisterService( fuseOnlineServiceName) {
-		ctrlr.RegisterDeployer(fuse.NewDeployer("fuse-deployer"))
+		deployers = append(deployers, fuse.NewDeployer(k8sClient, osClient))
 	}
 	if shouldRegisterService(launcherServiceName) {
-		ctrlr.RegisterDeployer(launcher.NewDeployer("launcher-deployer"))
+		deployers = append(deployers, launcher.NewDeployer())
 	}
 	if shouldRegisterService( cheServiceName) {
-		ctrlr.RegisterDeployer(che.NewDeployer("che-deployer"))
+		deployers = append(deployers, che.NewDeployer())
 	}
 	if shouldRegisterService( threeScaleServiceName) {
-		ctrlr.RegisterDeployer(threescale.NewDeployer("3scale-deployer"))
+		deployers = append(deployers, threescale.NewDeployer())
 	}
 	if shouldRegisterService( apicurioServiceName) {
-		ctrlr.RegisterDeployer(apicurio.NewDeployer("apicurio-deployer"))
+		deployers = append(deployers, apicurio.NewDeployer())
 	}
+	ctrlr := controller.CreateController(deployers)
+
 	ctrlr.Catalog()
 
 	if options.TLSCert == "" && options.TLSKey == "" {