Merge pull request #15486 from bparees/ose_sc

Automatic merge from submit-queue (batch tested with PRs 15486, 15482) respect --image flag value for service catalog image name bug 1475219 https://bugzilla.redhat.com/show_bug.cgi?id=1475219
openshift · Jul 28, 2017 · ea2c299 · ea2c299
2 parents dfb5026 + 7c8cb15
commit ea2c299
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/examples/service-catalog/service-catalog.yaml b/examples/service-catalog/service-catalog.yaml
@@ -214,7 +214,7 @@ objects:
           - "10"
           - --cors-allowed-origins
           - ${CORS_ALLOWED_ORIGIN}
-          image: openshift/origin-service-catalog:${SERVICE_CATALOG_TAG}
+          image: ${SERVICE_CATALOG_IMAGE}
           imagePullPolicy: IfNotPresent
           name: apiserver
           ports:
@@ -312,7 +312,7 @@ objects:
           - service-catalog
           - --broker-relist-interval
           - "5m"
-          image: openshift/origin-service-catalog:${SERVICE_CATALOG_TAG}
+          image: ${SERVICE_CATALOG_IMAGE}
           imagePullPolicy: IfNotPresent
           name: controller-manager
           ports:
@@ -356,11 +356,11 @@ parameters:
   name: CORS_ALLOWED_ORIGIN
   required: true
   value: 10.192.213.116
-- description: Tag of the service catalog images to use for apiserver and controller-manager
-  displayName: Service catalog image tag
-  name: SERVICE_CATALOG_TAG
+- description: Name of the service catalog image to use for apiserver and controller-manager
+  displayName: Service catalog image name
+  name: SERVICE_CATALOG_IMAGE
   required: true
-  value: latest
+  value: openshift/origin-service-catalog:latest
 - description: Cluster ip address for the service catalog service
   displayName: Service Catalog Service IP
   name: SERVICE_CATALOG_SERVICE_IP

diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go
diff --git a/pkg/oc/bootstrap/docker/openshift/servicecatalog.go b/pkg/oc/bootstrap/docker/openshift/servicecatalog.go
@@ -20,6 +20,7 @@ import (
 	authzapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
 
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
+	"github.com/openshift/origin/pkg/cmd/util/variable"
 	"github.com/openshift/origin/pkg/oc/bootstrap/docker/errors"
 )
 
@@ -31,7 +32,7 @@ const (
 )
 
 // InstallServiceCatalog checks whether the service catalog is installed and installs it if not already installed
-func (h *Helper) InstallServiceCatalog(f *clientcmd.Factory, configDir, publicMaster, catalogHost string, tag string) error {
+func (h *Helper) InstallServiceCatalog(f *clientcmd.Factory, configDir, publicMaster, catalogHost string, imageFormat string) error {
 	osClient, kubeClient, err := f.Clients()
 	if err != nil {
 		return errors.NewError("cannot obtain API clients").WithCause(err).WithDetails(h.OriginLog())
@@ -80,10 +81,14 @@ func (h *Helper) InstallServiceCatalog(f *clientcmd.Factory, configDir, publicMa
 	}
 
 	// Instantiate service catalog
+	imageTemplate := variable.NewDefaultImageTemplate()
+	imageTemplate.Format = imageFormat
+	imageTemplate.Latest = false
+
 	params := map[string]string{
 		"SERVICE_CATALOG_SERVICE_IP": ServiceCatalogServiceIP,
 		"CORS_ALLOWED_ORIGIN":        publicMaster,
-		"SERVICE_CATALOG_TAG":        tag,
+		"SERVICE_CATALOG_IMAGE":      imageTemplate.ExpandOrDie("service-catalog"),
 	}
 	glog.V(2).Infof("instantiating service catalog template with parameters %v", params)
 

diff --git a/pkg/oc/bootstrap/docker/up.go b/pkg/oc/bootstrap/docker/up.go
@@ -1033,8 +1033,7 @@ func (c *ClientStartConfig) InstallServiceCatalog(out io.Writer) error {
 	if len(publicMaster) == 0 {
 		publicMaster = c.ServerIP
 	}
-	tag := c.ImageVersion
-	return c.OpenShiftHelper().InstallServiceCatalog(f, c.LocalConfigDir, publicMaster, openshift.CatalogHost(c.RoutingSuffix, c.ServerIP), tag)
+	return c.OpenShiftHelper().InstallServiceCatalog(f, c.LocalConfigDir, publicMaster, openshift.CatalogHost(c.RoutingSuffix, c.ServerIP), c.imageFormat())
 }
 
 // Login logs into the new server and sets up a default user and project