Skip to content

O
origin-web-common
Commit 56b14392 by Samuel Padgett
Options

Adopt more service catalog API changes 

* Cluster prefix for service classes and plans
* ServiceInstanceCredential -> ServiceBinding
parent ba4afa8b
Showing with 37 additions and 46 deletions
dist/origin-web-common-services.js
......@@ -1126,7 +1126,7 @@ angular.module("openshiftCommonServices")
return null;
}
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
if (!serviceClassName) {
return null;
}
......@@ -1178,8 +1178,8 @@ angular.module("openshiftCommonServices")
var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
var binding = {
kind: 'ServiceInstanceCredential',
apiVersion: 'servicecatalog.k8s.io/v1alpha1',
kind: 'ServiceBinding',
apiVersion: 'servicecatalog.k8s.io/v1beta1',
metadata: {
generateName: instanceName + '-'
},
......@@ -1289,8 +1289,8 @@ angular.module("openshiftCommonServices")
}
return _.filter(serviceInstances, function (serviceInstance) {
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.servicePlanRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.clusterServicePlanRef.name');
return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], servicePlans[servicePlanName]);
});
};
......@@ -1302,8 +1302,8 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances,
function(item) {
var serviceClassName = _.get(item, 'spec.serviceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalServiceClassName;
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName;
},
function(item) {
return _.get(item, 'metadata.name', '');
......@@ -3671,10 +3671,8 @@ angular.module('openshiftCommonServices')
'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: {version: 'v1', resource: 'configmaps' },
// Using the anticipated name for the resources, even though they aren't yet prefixed with `cluster`.
// https://github.com/kubernetes-incubator/service-catalog/issues/1288
clusterserviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', resource: 'serviceplans' },
clusterserviceclasses: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceplans' },
deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
......@@ -3697,9 +3695,8 @@ angular.module('openshiftCommonServices')
selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: {version: 'v1', resource: 'services' },
serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
// Using the anticipated name for this resource, even though it's not currently called servicebindings.
servicebindings: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
servicebindings: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'servicebindings' },
serviceinstances: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'serviceinstances' },
statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
});
dist/origin-web-common-ui.js
......@@ -63,7 +63,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.serviceClassRef.name}}\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.clusterServiceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.clusterServiceClassRef.name}}\n" +
" </label>\n" +
" <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" +
......
dist/origin-web-common.js
......@@ -234,7 +234,7 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.serviceClassRef.name}}\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.clusterServiceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.clusterServiceClassRef.name}}\n" +
" </label>\n" +
" <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" +
......@@ -1439,10 +1439,8 @@ angular.module('openshiftCommonServices')
'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: {version: 'v1', resource: 'configmaps' },
// Using the anticipated name for the resources, even though they aren't yet prefixed with `cluster`.
// https://github.com/kubernetes-incubator/service-catalog/issues/1288
clusterserviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', resource: 'serviceplans' },
clusterserviceclasses: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceplans' },
deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
......@@ -1465,9 +1463,8 @@ angular.module('openshiftCommonServices')
selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: {version: 'v1', resource: 'services' },
serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
// Using the anticipated name for this resource, even though it's not currently called servicebindings.
servicebindings: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
servicebindings: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'servicebindings' },
serviceinstances: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'serviceinstances' },
statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
});
......@@ -3143,7 +3140,7 @@ angular.module("openshiftCommonServices")
return null;
}
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
if (!serviceClassName) {
return null;
}
......@@ -3195,8 +3192,8 @@ angular.module("openshiftCommonServices")
var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
var binding = {
kind: 'ServiceInstanceCredential',
apiVersion: 'servicecatalog.k8s.io/v1alpha1',
kind: 'ServiceBinding',
apiVersion: 'servicecatalog.k8s.io/v1beta1',
metadata: {
generateName: instanceName + '-'
},
......@@ -3306,8 +3303,8 @@ angular.module("openshiftCommonServices")
}
return _.filter(serviceInstances, function (serviceInstance) {
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.servicePlanRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.clusterServicePlanRef.name');
return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], servicePlans[servicePlanName]);
});
};
......@@ -3319,8 +3316,8 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances,
function(item) {
var serviceClassName = _.get(item, 'spec.serviceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalServiceClassName;
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName;
},
function(item) {
return _.get(item, 'metadata.name', '');
......
dist/scripts/templates.js
......@@ -34,7 +34,7 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" <div ng-repeat=\"serviceInstance in ctrl.bindableServiceInstances\" class=\"bind-service-selection\">\n" +
" <label>\n" +
" <input type=\"radio\" ng-model=\"ctrl.serviceToBind\" ng-value=\"serviceInstance\">\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.serviceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.serviceClassRef.name}}\n" +
" {{ctrl.serviceClasses[serviceInstance.spec.clusterServiceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.clusterServiceClassRef.name}}\n" +
" </label>\n" +
" <div class=\"bind-description\">\n" +
" <span class=\"pficon pficon-info\"\n" +
......
src/components/binding/bindApplicationForm.html
......@@ -30,7 +30,7 @@
<div ng-repeat="serviceInstance in ctrl.bindableServiceInstances" class="bind-service-selection">
<label>
<input type="radio" ng-model="ctrl.serviceToBind" ng-value="serviceInstance">
{{ctrl.serviceClasses[serviceInstance.spec.serviceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.serviceClassRef.name}}
{{ctrl.serviceClasses[serviceInstance.spec.clusterServiceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.clusterServiceClassRef.name}}
</label>
<div class="bind-description">
<span class="pficon pficon-info"
......
src/constants/apiPreferredVersions.js
......@@ -8,10 +8,8 @@ angular.module('openshiftCommonServices')
'buildconfigs/instantiate': {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs/instantiate' },
buildconfigs: {group: 'build.openshift.io', version: 'v1', resource: 'buildconfigs' },
configmaps: {version: 'v1', resource: 'configmaps' },
// Using the anticipated name for the resources, even though they aren't yet prefixed with `cluster`.
// https://github.com/kubernetes-incubator/service-catalog/issues/1288
clusterserviceclasses: {group: 'servicecatalog.k8s.io', resource: 'serviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', resource: 'serviceplans' },
clusterserviceclasses: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceclasses' },
clusterserviceplans: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'clusterserviceplans' },
deployments: {group: 'apps', version: 'v1beta1', resource: 'deployments' },
deploymentconfigs: {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs' },
'deploymentconfigs/instantiate': {group: 'apps.openshift.io', version: 'v1', resource: 'deploymentconfigs/instantiate' },
......@@ -34,9 +32,8 @@ angular.module('openshiftCommonServices')
selfsubjectrulesreviews: {group: 'authorization.openshift.io', version: 'v1', resource: 'selfsubjectrulesreviews' },
services: {version: 'v1', resource: 'services' },
serviceaccounts: {version: 'v1', resource: 'serviceaccounts' },
// Using the anticipated name for this resource, even though it's not currently called servicebindings.
servicebindings: {group: 'servicecatalog.k8s.io', resource: 'serviceinstancecredentials' },
serviceinstances: {group: 'servicecatalog.k8s.io', resource: 'serviceinstances' },
servicebindings: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'servicebindings' },
serviceinstances: {group: 'servicecatalog.k8s.io', version: 'v1beta1', resource: 'serviceinstances' },
statefulsets: {group: 'apps', version: 'v1beta1', resource: 'statefulsets' },
templates: {group: 'template.openshift.io', verison: 'v1', resource: 'templates' }
});
src/services/bindService.js
......@@ -18,7 +18,7 @@ angular.module("openshiftCommonServices")
return null;
}
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
if (!serviceClassName) {
return null;
}
......@@ -70,8 +70,8 @@ angular.module("openshiftCommonServices")
var credentialSecretName = generateSecretName(serviceInstance.metadata.name + '-credentials-');
var binding = {
kind: 'ServiceInstanceCredential',
apiVersion: 'servicecatalog.k8s.io/v1alpha1',
kind: 'ServiceBinding',
apiVersion: 'servicecatalog.k8s.io/v1beta1',
metadata: {
generateName: instanceName + '-'
},
......@@ -181,8 +181,8 @@ angular.module("openshiftCommonServices")
}
return _.filter(serviceInstances, function (serviceInstance) {
var serviceClassName = _.get(serviceInstance, 'spec.serviceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.servicePlanRef.name');
var serviceClassName = _.get(serviceInstance, 'spec.clusterServiceClassRef.name');
var servicePlanName = _.get(serviceInstance, 'spec.clusterServicePlanRef.name');
return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], servicePlans[servicePlanName]);
});
};
......@@ -194,8 +194,8 @@ angular.module("openshiftCommonServices")
return _.sortBy(serviceInstances,
function(item) {
var serviceClassName = _.get(item, 'spec.serviceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalServiceClassName;
var serviceClassName = _.get(item, 'spec.clusterServiceClassRef.name');
return _.get(serviceClasses, [serviceClassName, 'spec', 'externalMetadata', 'displayName']) || item.spec.externalClusterServiceClassName;
},
function(item) {
return _.get(item, 'metadata.name', '');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment