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 51 additions and 56 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/origin-web-common.min.js
......@@ -85,7 +85,7 @@ maxlength:253,
description:"Name must consist of lower-case letters, numbers, periods, and hyphens. It must start and end with a letter or a number."
}).constant("IS_IOS", /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream), hawtioPluginLoader.addModule("openshiftCommonUI"), angular.module("openshiftCommonUI").run([ "$templateCache", function($templateCache) {
"use strict";
$templateCache.put("src/components/binding/bindApplicationForm.html", '<div class="bind-form">\n <form>\n <div class="form-group">\n <label>\n <h3>Create a binding for application <strong>{{ctrl.applicationName}}</strong></h3>\n </label>\n <span class="help-block">\n Bindings create a secret containing the necessary information for an application to use a service.\n </span>\n </div>\n </form>\n\n <label ng-if="!ctrl.allowNoBinding">\n Select a service:\n </label>\n <form name="ctrl.formName">\n <fieldset>\n <div class="radio">\n <div ng-if="ctrl.allowNoBinding" class="bind-service-selection">\n <label>\n <input type="radio" ng-model="ctrl.serviceToBind" ng-value="null">\n Do not bind at this time.\n </label>\n <div class="bind-description">\n <span class="help-block service-instance-name">\n Bindings can be created later from within a project.\n </span>\n </div>\n </div>\n <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 </label>\n <div class="bind-description">\n <span class="pficon pficon-info"\n ng-if="!(serviceInstance | isServiceInstanceReady)"\n data-content="This service is not yet ready. If you bind to it, then the binding will be pending until the service is ready."\n data-toggle="popover"\n data-trigger="hover">\n </span>\n <span class="help-block service-instance-name">\n {{serviceInstance.metadata.name}}\n </span>\n </div>\n </div>\n <h4 ng-if="!ctrl.bindableServiceInstances.length">\n <span class="pficon pficon-info" aria-hidden="true"></span>\n <span class="help-block service-instance-name">\n There are no bindable services in this project\n </span>\n </h4>\n </div>\n </fieldset>\n </form>\n</div>\n'),
$templateCache.put("src/components/binding/bindApplicationForm.html", '<div class="bind-form">\n <form>\n <div class="form-group">\n <label>\n <h3>Create a binding for application <strong>{{ctrl.applicationName}}</strong></h3>\n </label>\n <span class="help-block">\n Bindings create a secret containing the necessary information for an application to use a service.\n </span>\n </div>\n </form>\n\n <label ng-if="!ctrl.allowNoBinding">\n Select a service:\n </label>\n <form name="ctrl.formName">\n <fieldset>\n <div class="radio">\n <div ng-if="ctrl.allowNoBinding" class="bind-service-selection">\n <label>\n <input type="radio" ng-model="ctrl.serviceToBind" ng-value="null">\n Do not bind at this time.\n </label>\n <div class="bind-description">\n <span class="help-block service-instance-name">\n Bindings can be created later from within a project.\n </span>\n </div>\n </div>\n <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.clusterServiceClassRef.name].spec.externalMetadata.displayName || serviceInstance.spec.clusterServiceClassRef.name}}\n </label>\n <div class="bind-description">\n <span class="pficon pficon-info"\n ng-if="!(serviceInstance | isServiceInstanceReady)"\n data-content="This service is not yet ready. If you bind to it, then the binding will be pending until the service is ready."\n data-toggle="popover"\n data-trigger="hover">\n </span>\n <span class="help-block service-instance-name">\n {{serviceInstance.metadata.name}}\n </span>\n </div>\n </div>\n <h4 ng-if="!ctrl.bindableServiceInstances.length">\n <span class="pficon pficon-info" aria-hidden="true"></span>\n <span class="help-block service-instance-name">\n There are no bindable services in this project\n </span>\n </h4>\n </div>\n </fieldset>\n </form>\n</div>\n'),
$templateCache.put("src/components/binding/bindResults.html", '<div ng-if="!ctrl.error && !(ctrl.binding | isBindingFailed)">\n <div ng-if="ctrl.binding && !(ctrl.binding | isBindingReady)" class="results-status">\n <span class="fa fa-clock-o text-muted" aria-hidden="true"></span>\n <span class="sr-only">Pending</span>\n <div class="results-message">\n <h3>\n The binding is being created.\n </h3>\n <p class="results-message-details">This may take several minutes.</p>\n </div>\n </div>\n <div ng-if="(ctrl.binding | isBindingReady)">\n <div class="results-status">\n <span class="pficon pficon-ok" aria-hidden="true"></span>\n <span class="sr-only">Success</span>\n <div class="results-message">\n <h3>\n <span ng-if="ctrl.bindType === \'application\'">\n <strong>{{ctrl.serviceToBind}}</strong> has been bound to\n <strong>{{ctrl.applicationToBind}}</strong> successfully.\n </span>\n <span ng-if="ctrl.bindType !== \'application\'">\n The binding <strong>{{ctrl.serviceToBind}}</strong> has been created successfully.\n </span>\n </h3>\n <p class="results-message-details">\n The binding operation created the secret\n <a ng-if="ctrl.secretHref" ng-href="{{ctrl.secretHref}}">{{ctrl.binding.spec.secretName}}</a>\n <span ng-if="!ctrl.secretHref">{{ctrl.binding.spec.secretName}}</span>\n that you may need to reference in your application.\n <span ng-if="ctrl.showPodPresets">Its data will be available to your application as environment variables.</span>\n </p>\n </div>\n </div>\n <div class="alert alert-info results-info" ng-if="ctrl.bindType === \'application\'">\n <span class="pficon pficon-info" aria-hidden="true"></span>\n <span class="sr-only">Info</span>\n The binding secret will only be available to new pods. You will need to redeploy your application.\n </div>\n </div>\n</div>\n<div ng-if="ctrl.error || (ctrl.binding | isBindingFailed)">\n <div class="results-status">\n <span class="pficon pficon-error-circle-o text-danger" aria-hidden="true"></span>\n <span class="sr-only">Error</span>\n <div class="results-message">\n <h3>\n The binding could not be created.\n </h3>\n </div>\n </div>\n <div ng-if="ctrl.error" class="sub-title">\n <span ng-if="ctrl.error.data.message">\n {{ctrl.error.data.message | upperFirst}}\n </span>\n <span ng-if="!ctrl.error.data.message">\n An error occurred creating the binding.\n </span>\n </div>\n <div ng-if="!ctrl.error" class="sub-title">\n {{ctrl.binding | bindingFailedMessage}}\n </div>\n</div>\n'),
$templateCache.put("src/components/binding/bindServiceForm.html", '<div class="bind-form">\n <form>\n <div class="form-group">\n <label>\n <h3>Create a binding for <strong>{{ctrl.serviceClass.spec.externalMetadata.displayName || ctrl.serviceClass.spec.externalName}}</strong></h3>\n </label>\n <span class="help-block">Bindings create a secret containing the necessary information for an application to use this service.</span>\n </div>\n </form>\n\n <form ng-if="ctrl.allowNoBinding || ctrl.showPodPresets" name="ctrl.formName" class="mar-bottom-lg">\n <fieldset>\n <div class="radio">\n <label ng-if="ctrl.showPodPresets" class="bind-choice" ng-disabled="!ctrl.applications.length">\n <input type="radio" ng-model="ctrl.bindType" value="application" ng-disabled="!ctrl.applications.length">\n Create a secret and inject it into an application\n </label>\n <div ng-if="ctrl.showPodPresets" class="application-select">\n <ui-select ng-model="ctrl.appToBind"\n ng-disabled="ctrl.bindType !== \'application\'"\n ng-required="ctrl.bindType === \'application\'">\n <ui-select-match placeholder="{{ctrl.applications.length ? \'Select an application\' : \'There are no applications in this project\'}}">\n <span>\n {{$select.selected.metadata.name}}\n <small class="text-muted">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n </span>\n </ui-select-match>\n <ui-select-choices\n repeat="application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)"\n group-by="ctrl.groupByKind">\n <span ng-bind-html="application.metadata.name | highlight : $select.search"></span>\n </ui-select-choices>\n </ui-select>\n </div>\n <label class="bind-choice">\n <input type="radio" ng-model="ctrl.bindType" value="secret-only">\n Create a secret in <strong>{{ctrl.projectName}}</strong> to be used later\n </label>\n <div class="help-block bind-description">\n Secrets can be referenced later from an application.\n </div>\n <label ng-if="ctrl.allowNoBinding" class="bind-choice">\n <input type="radio" ng-model="ctrl.bindType" value="none">\n Do not bind at this time\n </label>\n <div ng-if="ctrl.allowNoBinding" class="help-block bind-description">\n Bindings can be created later from within a project.\n </div>\n </div>\n </fieldset>\n </form>\n</div>\n'),
$templateCache.put("src/components/create-project/createProject.html", '<form name="createProjectForm" novalidate>\n <fieldset ng-disabled="disableInputs">\n <div class="form-group">\n <label for="name" class="required">Name</label>\n <span ng-class="{\'has-error\': (createProjectForm.name.$error.pattern && createProjectForm.name.$touched) || nameTaken}">\n <input class="form-control"\n name="name"\n id="name"\n placeholder="my-project"\n type="text"\n required\n take-focus\n minlength="2"\n maxlength="63"\n pattern="[a-z0-9]([-a-z0-9]*[a-z0-9])?"\n aria-describedby="nameHelp"\n ng-model="name"\n ng-model-options="{ updateOn: \'default blur\' }"\n ng-change="nameTaken = false"\n autocorrect="off"\n autocapitalize="off"\n spellcheck="false">\n </span>\n <div>\n <span class="help-block">A unique name for the project.</span>\n </div>\n <div class="has-error">\n <span id="nameHelp" class="help-block" ng-if="createProjectForm.name.$error.required && createProjectForm.name.$dirty">\n Name is required.\n </span>\n </div>\n <div class="has-error">\n <span id="nameHelp" class="help-block" ng-if="createProjectForm.name.$error.minlength && createProjectForm.name.$touched">\n Name must have at least two characters.\n </span>\n </div>\n <div class="has-error">\n <span id="nameHelp" class="help-block" ng-if="createProjectForm.name.$error.pattern && createProjectForm.name.$touched">\n Project names may only contain lower-case letters, numbers, and dashes.\n They may not start or end with a dash.\n </span>\n </div>\n <div class="has-error">\n <span class="help-block" ng-if="nameTaken">\n This name is already in use. Please choose a different name.\n </span>\n </div>\n </div>\n\n <div class="form-group">\n <label for="displayName">Display Name</label>\n <input class="form-control"\n name="displayName"\n id="displayName"\n placeholder="My Project"\n type="text"\n ng-model="displayName">\n </div>\n\n <div class="form-group">\n <label for="description">Description</label>\n <textarea class="form-control"\n name="description"\n id="description"\n placeholder="A short description."\n ng-model="description"></textarea>\n </div>\n\n <div class="button-group">\n <button type="submit"\n class="btn btn-primary"\n ng-class="{\'dialog-btn\': isDialog}"\n ng-click="createProject()"\n ng-disabled="createProjectForm.$invalid || nameTaken || disableInputs"\n value="">\n Create\n </button>\n <button\n class="btn btn-default"\n ng-class="{\'dialog-btn\': isDialog}"\n ng-click="cancelCreateProject()">\n Cancel\n </button>\n </div>\n </fieldset>\n</form>\n'),
......@@ -512,11 +512,13 @@ resource:"configmaps"
},
clusterserviceclasses:{
group:"servicecatalog.k8s.io",
resource:"serviceclasses"
version:"v1beta1",
resource:"clusterserviceclasses"
},
clusterserviceplans:{
group:"servicecatalog.k8s.io",
resource:"serviceplans"
version:"v1beta1",
resource:"clusterserviceplans"
},
deployments:{
group:"apps",
......@@ -620,10 +622,12 @@ resource:"serviceaccounts"
},
servicebindings:{
group:"servicecatalog.k8s.io",
resource:"serviceinstancecredentials"
version:"v1beta1",
resource:"servicebindings"
},
serviceinstances:{
group:"servicecatalog.k8s.io",
version:"v1beta1",
resource:"serviceinstances"
},
statefulsets:{
......@@ -1390,7 +1394,7 @@ return data;
}), angular.module("openshiftCommonServices").service("BindingService", [ "$filter", "$q", "APIService", "AuthService", "DataService", "DNS1123_SUBDOMAIN_VALIDATION", function($filter, $q, APIService, AuthService, DataService, DNS1123_SUBDOMAIN_VALIDATION) {
var PARAMETERS_SECRET_KEY = "parameters", bindingResource = APIService.getPreferredVersion("servicebindings"), getServiceClassForInstance = function(serviceInstance, serviceClasses) {
if (!serviceClasses) return null;
var serviceClassName = _.get(serviceInstance, "spec.serviceClassRef.name");
var serviceClassName = _.get(serviceInstance, "spec.clusterServiceClassRef.name");
return serviceClassName ? serviceClasses[serviceClassName] :null;
}, generateName = $filter("generateName"), generateSecretName = function(prefix) {
var generateNameLength = 5, secretNamePrefix = _.truncate(prefix, {
......@@ -1419,8 +1423,8 @@ stringData:{}
return secret.stringData[PARAMETERS_SECRET_KEY] = JSON.stringify(parameters), secret;
}, makeBinding = function(serviceInstance, application, parametersSecretName) {
var instanceName = serviceInstance.metadata.name, credentialSecretName = generateSecretName(serviceInstance.metadata.name + "-credentials-"), binding = {
kind:"ServiceInstanceCredential",
apiVersion:"servicecatalog.k8s.io/v1alpha1",
kind:"ServiceBinding",
apiVersion:"servicecatalog.k8s.io/v1beta1",
metadata:{
generateName:instanceName + "-"
},
......@@ -1464,13 +1468,13 @@ podPresetSelector.covers(applicationSelector) && resourceBindings.push(bindings[
}), resourceBindings;
}, filterBindableServiceInstances = function(serviceInstances, serviceClasses, servicePlans) {
return serviceInstances && serviceClasses && servicePlans ? _.filter(serviceInstances, function(serviceInstance) {
var serviceClassName = _.get(serviceInstance, "spec.serviceClassRef.name"), servicePlanName = _.get(serviceInstance, "spec.servicePlanRef.name");
var serviceClassName = _.get(serviceInstance, "spec.clusterServiceClassRef.name"), servicePlanName = _.get(serviceInstance, "spec.clusterServicePlanRef.name");
return isServiceBindable(serviceInstance, serviceClasses[serviceClassName], servicePlans[servicePlanName]);
}) :null;
}, sortServiceInstances = function(serviceInstances, serviceClasses) {
return serviceInstances || serviceClasses ? _.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", "");
}) :null;
......
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