use openshift service catalog in cluster up #15316
Conversation
|
[test] |
pkg/bootstrap/docker/up.go
Outdated
| @@ -1033,8 +1033,13 @@ func (c *ClientStartConfig) InstallServiceCatalog(out io.Writer) error { | |||
| if len(publicMaster) == 0 { | |||
| publicMaster = c.ServerIP | |||
| } | |||
| tag := c.ImageVersion | |||
| if len(c.ImageVersion) == 0 { | |||
There was a problem hiding this comment.
I don't think this condition would ever be true, given that if we don't get one in the command line we default to the one compiled with the oc binary. However, if it was ever true, you would have to prepend "v" to the version string you get below
There was a problem hiding this comment.
ok i'll just remove this, thanks.
|
Evaluated for origin test up to 8c4ba94 |
|
LGTM |
|
[merge] |
|
flake #14897 |
|
[merge] |
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3357/) (Base Commit: d784563) (PR Branch Commit: 8c4ba94) |
|
flake #14385 |
|
Evaluated for origin merge up to 8c4ba94 |
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1335/) (Base Commit: 8833a3a) (PR Branch Commit: 8c4ba94) (Image: devenv-rhel7_6470) |
fixes #15237
we'll now use the openshift distributed service catalog images, and we'll tie the SC image tag to the --version flag (or the oc server version if no --version is passed)