switch to template-service-broker binary

deads2k · bparees · commit 4b6f7f5511d0 · 2017-11-15T18:20:13.000-05:00
diff --git a/hack/build-local-images.py b/hack/build-local-images.py
@@ -146,6 +146,13 @@
         "files": {},
         "enable_default": False,
     },
+    "template-service-broker": {
+        "directory": "template-service-broker",
+        "binaries": {
+            "openshift": "/usr/bin/template-service-broker"
+        },
+        "files": {}
+    },
 }
 
 
diff --git a/install/templateservicebroker/apiserver-template.yaml b/install/templateservicebroker/apiserver-template.yaml
@@ -4,7 +4,7 @@ metadata:
   name: template-service-broker-apiserver
 parameters:
 - name: IMAGE
-  value: openshift/origin:latest
+  value: openshift/origin-template-service-broker:latest
 - name: NAMESPACE
   value: openshift-template-service-broker
 - name: LOGLEVEL
@@ -40,7 +40,7 @@ objects:
           image: ${IMAGE}
           imagePullPolicy: IfNotPresent
           command:
-          - "/usr/bin/openshift"
+          - "/usr/bin/template-service-broker"
           - "start"
           - "template-service-broker"
           - "--secure-port=8443"
diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go
diff --git a/pkg/oc/bootstrap/docker/openshift/templateservicebroker.go b/pkg/oc/bootstrap/docker/openshift/templateservicebroker.go
@@ -53,7 +53,7 @@ func (h *Helper) InstallTemplateServiceBroker(f *clientcmd.Factory, imageFormat
 	imageTemplate.Latest = false
 
 	params := map[string]string{
-		"IMAGE":     imageTemplate.ExpandOrDie(""),
+		"IMAGE":     imageTemplate.ExpandOrDie("template-service-broker"),
 		"LOGLEVEL":  fmt.Sprint(serverLogLevel),
 		"NAMESPACE": tsbNamespace,
 	}
diff --git a/pkg/oc/bootstrap/docker/up.go b/pkg/oc/bootstrap/docker/up.go
@@ -1097,7 +1097,7 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {
 	}
 	// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin
 	//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())
-	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s:%s", c.Image, c.ImageVersion), c.ServerLogLevel)
+	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s-${component}:%s", c.Image, c.ImageVersion), c.ServerLogLevel)
 }
 
 // RegisterTemplateServiceBroker will register the tsb with the service catalog
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (h Helper) InstallTemplateServiceBroker(f clientcmd.Factory, imageFormat`
`53`	`53`	`imageTemplate.Latest = false`
`54`	`54`
`55`	`55`	`params := map[string]string{`
`56`		`- "IMAGE": imageTemplate.ExpandOrDie(""),`
	`56`	`+ "IMAGE": imageTemplate.ExpandOrDie("template-service-broker"),`
`57`	`57`	`"LOGLEVEL": fmt.Sprint(serverLogLevel),`
`58`	`58`	`"NAMESPACE": tsbNamespace,`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {`
`1097`	`1097`	`}`
`1098`	`1098`	`// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin`
`1099`	`1099`	`//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())`
`1100`		`- return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s:%s", c.Image, c.ImageVersion), c.ServerLogLevel)`
	`1100`	`+ return c.OpenShiftHelper().InstallTemplateServiceBroker(f, fmt.Sprintf("%s-${component}:%s", c.Image, c.ImageVersion), c.ServerLogLevel)`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`// RegisterTemplateServiceBroker will register the tsb with the service catalog`