Skip to content

Adopt more service catalog API changes#2235

Merged
openshift-bot merged 1 commit intoopenshift:masterfrom
spadgett:catalog-api-changes
Oct 11, 2017
Merged

Adopt more service catalog API changes#2235
openshift-bot merged 1 commit intoopenshift:masterfrom
spadgett:catalog-api-changes

Conversation

@spadgett
Copy link
Member

@spadgett spadgett commented Oct 9, 2017

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

  • Update to v1beta1 instead of v1alpha1
  • Cluster prefix for service classes and plans
  • ServiceInstanceCredential -> ServiceBinding
  • Check removedFromBrokerCatalog

cc @jeff-phillips-18 @pmorie

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 9, 2017
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);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be ServiceInstancesService.getServiceClassNameForInstance

@spadgett spadgett force-pushed the catalog-api-changes branch 3 times, most recently from b79db0e to 3eeb8ea Compare October 10, 2017 20:12
@spadgett
Copy link
Member Author

Needs catalog and common releases, but @jeff-phillips-18 PTAL

@spadgett spadgett force-pushed the catalog-api-changes branch from 3eeb8ea to cc98596 Compare October 11, 2017 18:03
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 11, 2017
@spadgett spadgett force-pushed the catalog-api-changes branch from cc98596 to 7657983 Compare October 11, 2017 18:23
return !_.isEmpty(alternateBackends);
};
})
.filter('serviceClassDisplayName', function() {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jeff-phillips-18 I removed the filters added to common

@spadgett
Copy link
Member Author

Bumped common and catalog versions and added dist

[test]

@spadgett
Copy link
Member Author

Origin PR is openshift/origin#16783

* 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 spadgett force-pushed the catalog-api-changes branch from 7657983 to f5cf00b Compare October 11, 2017 18:49
@openshift-bot
Copy link

Evaluated for origin web console test up to f5cf00b

@openshift-bot
Copy link

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 spadgett changed the title [DO NOT MERGE] [WIP] Adopt more service catalog API changes Adopt more service catalog API changes Oct 11, 2017
@spadgett
Copy link
Member Author

[merge]

@openshift-bot
Copy link

openshift-bot commented Oct 11, 2017

Origin Web Console Merge Results: Waiting: You are in the build queue at position: 1

@openshift-bot
Copy link

Evaluated for origin web console merge up to f5cf00b

@openshift-bot openshift-bot merged commit ba1a820 into openshift:master Oct 11, 2017
@spadgett spadgett deleted the catalog-api-changes branch October 11, 2017 19:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants