Adopt more service catalog API changes #2235
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/M
|
|
||
| var updateServiceClass = function() { | ||
| if (_.get(ctrl.refApiObject, 'kind') !== 'ServiceInstance') { | ||
| var instanceName = _.get(ctrl.binding, 'spec.instanceRef.name'); | ||
| var instance = _.get(ctrl.serviceInstances, [instanceName]); | ||
| var serviceClassName = _.get(instance, 'spec.serviceClassRef.name'); | ||
| var serviceClassName = ServiceInstancesService.getServicePlanNameForInstance(instance); |
There was a problem hiding this comment.
This should be ServiceInstancesService.getServiceClassNameForInstance
spadgett
force-pushed
the
catalog-api-changes
branch
3 times, most recently
from
b79db0e
to
3eeb8ea
Compare
|
Needs catalog and common releases, but @jeff-phillips-18 PTAL |
jeff-phillips-18
approved these changes
Oct 11, 2017
spadgett
force-pushed
the
catalog-api-changes
branch
from
3eeb8ea
to
cc98596
Compare
openshift-ci-robot
added
size/L
spadgett
force-pushed
the
catalog-api-changes
branch
from
cc98596
to
7657983
Compare
spadgett
commented
Oct 11, 2017
| @@ -1316,45 +1316,6 @@ angular.module('openshiftConsole') | |||
| return !_.isEmpty(alternateBackends); | |||
| }; | |||
| }) | |||
| .filter('serviceClassDisplayName', function() { | |||
There was a problem hiding this comment.
@jeff-phillips-18 I removed the filters added to common
|
Bumped common and catalog versions and added dist [test] |
|
Origin PR is openshift/origin#16783 |
jeff-phillips-18
approved these changes
Oct 11, 2017
* Update to v1beta1 instead of v1alpha1 * Cluster prefix for service classes and plans * ServiceInstanceCredential -> ServiceBinding * Check removedFromBrokerCatalog Bump origin-web-common to 0.0.66 and origin-web-catalog to 0.0.54
spadgett
force-pushed
the
catalog-api-changes
branch
from
7657983
to
f5cf00b
Compare
|
Evaluated for origin web console test up to f5cf00b |
|
Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_web_console/333/) (Base Commit: 435773c) (PR Branch Commit: f5cf00b) |
spadgett
changed the title
|
[merge] |
|
Origin Web Console Merge Results: Waiting: You are in the build queue at position: 1 |
|
Evaluated for origin web console merge up to f5cf00b |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps origin-web-common to 0.0.66 and origin-web-catalog to 0.0.54
Requires openshift/origin-web-common#223
Requires openshift/origin-web-catalog#475
cc @jeff-phillips-18 @pmorie