Merge pull request #182 from spadgett/service-catalog-api-changes

Adopt new service catalog resource names

Author: Ben Petersen

dist/origin-web-common-services.js

@@ -1075,7 +1075,7 @@ angular.module("openshiftCommonServices")
 
     var bindingResource = {
       group: 'servicecatalog.k8s.io',
-      resource: 'bindings'
+      resource: 'serviceinstancecredentials'
     };
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
@@ -1133,7 +1133,7 @@ angular.module("openshiftCommonServices")
 
       var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
-        kind: 'Binding',
+        kind: 'ServiceInstanceCredential',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
         metadata: {
           generateName: instanceName + '-'
@@ -1211,7 +1211,7 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
-      if (_.get(apiObject, 'kind') === 'Instance') {
+      if (_.get(apiObject, 'kind') === 'ServiceInstance') {
         return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
       }
 

dist/origin-web-common.js

@@ -2955,7 +2955,7 @@ angular.module("openshiftCommonServices")
 
     var bindingResource = {
       group: 'servicecatalog.k8s.io',
-      resource: 'bindings'
+      resource: 'serviceinstancecredentials'
     };
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
@@ -3013,7 +3013,7 @@ angular.module("openshiftCommonServices")
 
       var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
-        kind: 'Binding',
+        kind: 'ServiceInstanceCredential',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
         metadata: {
           generateName: instanceName + '-'
@@ -3091,7 +3091,7 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
-      if (_.get(apiObject, 'kind') === 'Instance') {
+      if (_.get(apiObject, 'kind') === 'ServiceInstance') {
         return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
       }
 

dist/origin-web-common.min.js

@@ -1182,7 +1182,7 @@ return data;
 }), angular.module("openshiftCommonServices").service("BindingService", [ "$filter", "$q", "AuthService", "DataService", "DNS1123_SUBDOMAIN_VALIDATION", function($filter, $q, AuthService, DataService, DNS1123_SUBDOMAIN_VALIDATION) {
 var PARAMETERS_SECRET_KEY = "parameters", bindingResource = {
 group:"servicecatalog.k8s.io",
-resource:"bindings"
+resource:"serviceinstancecredentials"
 }, getServiceClassForInstance = function(serviceInstance, serviceClasses) {
 var serviceClassName = _.get(serviceInstance, "spec.serviceClassName");
 return _.get(serviceClasses, [ serviceClassName ]);
@@ -1218,7 +1218,7 @@ stringData:{}
 return secret.stringData[PARAMETERS_SECRET_KEY] = JSON.stringify(parameters), secret;
 }, makeBinding = function(serviceInstance, application, parametersSecretName) {
 var parametersSecretName, instanceName = serviceInstance.metadata.name, credentialSecretName = generateSecretName(serviceInstance.metadata.name + "-credentials-"), binding = {
-kind:"Binding",
+kind:"ServiceInstanceCredential",
 apiVersion:"servicecatalog.k8s.io/v1alpha1",
 metadata:{
 generateName:instanceName + "-"
@@ -1256,7 +1256,7 @@ var podPresetSelector = _.get(binding, "spec.alphaPodPresetTemplate.selector");
 podPresetSelector && (podPresetSelectors[binding.metadata.name] = new LabelSelector(podPresetSelector));
 }), podPresetSelectors;
 }, getBindingsForResource = function(bindings, apiObject) {
-if ("Instance" === _.get(apiObject, "kind")) return _.filter(bindings, [ "spec.instanceRef.name", _.get(apiObject, "metadata.name") ]);
+if ("ServiceInstance" === _.get(apiObject, "kind")) return _.filter(bindings, [ "spec.instanceRef.name", _.get(apiObject, "metadata.name") ]);
 var podPresetSelectors = getPodPresetSelectorsForBindings(bindings), applicationSelector = new LabelSelector(_.get(apiObject, "spec.selector")), resourceBindings = [];
 return _.each(podPresetSelectors, function(podPresetSelector, bindingName) {
 podPresetSelector.covers(applicationSelector) && resourceBindings.push(bindings[bindingName]);

src/services/bindService.js

@@ -12,7 +12,7 @@ angular.module("openshiftCommonServices")
 
     var bindingResource = {
       group: 'servicecatalog.k8s.io',
-      resource: 'bindings'
+      resource: 'serviceinstancecredentials'
     };
 
     var getServiceClassForInstance = function(serviceInstance, serviceClasses) {
@@ -70,7 +70,7 @@ angular.module("openshiftCommonServices")
 
       var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
       var binding = {
-        kind: 'Binding',
+        kind: 'ServiceInstanceCredential',
         apiVersion: 'servicecatalog.k8s.io/v1alpha1',
         metadata: {
           generateName: instanceName + '-'
@@ -148,7 +148,7 @@ angular.module("openshiftCommonServices")
     };
 
     var getBindingsForResource = function(bindings, apiObject) {
-      if (_.get(apiObject, 'kind') === 'Instance') {
+      if (_.get(apiObject, 'kind') === 'ServiceInstance') {
         return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
       }