Skip to content

Commit aafc1fa

Browse files
cdcabreracdcabrera
committed
Updates for Service Instance & Bindings
Updates for service instances. Prep to allow updates to chosen parameters for instance and bindings.
1 parent 5671a61 commit aafc1fa

17 files changed

+957
-112
lines changed

‎app/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ <h1>JavaScript Required</h1>
255255
<script src="scripts/controllers/statefulSet.js"></script>
256256
<script src="scripts/controllers/services.js"></script>
257257
<script src="scripts/controllers/service.js"></script>
258+
<script src="scripts/controllers/serviceInstances.js"></script>
259+
<script src="scripts/controllers/serviceInstance.js"></script>
258260
<script src="scripts/controllers/secrets.js"></script>
259261
<script src="scripts/controllers/secret.js"></script>
260262
<script src="scripts/controllers/createSecret.js"></script>

‎app/scripts/app.js

+10
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,16 @@ angular
271271
controller: 'ServiceController',
272272
reloadOnSearch: false
273273
})
274+
.when('/project/:project/browse/service-instances', {
275+
templateUrl: 'views/service-instances.html',
276+
controller: 'ServiceInstancesController',
277+
reloadOnSearch: false
278+
})
279+
.when('/project/:project/browse/service-instances/:instance', {
280+
templateUrl: 'views/browse/service-instance.html',
281+
controller: 'ServiceInstanceController',
282+
reloadOnSearch: false
283+
})
274284
.when('/project/:project/browse/storage', {
275285
templateUrl: 'views/storage.html',
276286
controller: 'StorageController',

‎app/scripts/constants.js

+14
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,20 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
190190
prefixes: [
191191
"/browse/routes/"
192192
]
193+
},
194+
{
195+
label: "Provisioned Services",
196+
href: "/browse/service-instances",
197+
prefixes: [
198+
"/browse/service-instances/"
199+
],
200+
isValid: function(){
201+
return _.get(window.OPENSHIFT_CONSTANTS, 'ENABLE_TECH_PREVIEW_FEATURE.service_catalog_landing_page');
202+
},
203+
canI: {
204+
resource: 'rolebindings',
205+
verb: 'list'
206+
}
193207
}
194208
]
195209
}

‎app/scripts/controllers/serviceInstance.js

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
'use strict';
2+
3+
angular.module('openshiftConsole')
4+
.controller('ServiceInstanceController', function ($scope,
5+
$filter,
6+
$routeParams,
7+
DataService,
8+
ProjectsService) {
9+
$scope.alerts = {};
10+
//$scope.displayName = null;
11+
$scope.projectName = $routeParams.project;
12+
$scope.serviceInstance = null;
13+
$scope.serviceClass = null;
14+
$scope.serviceClasses = {};
15+
16+
$scope.breadcrumbs = [
17+
{
18+
title: "Provisioned Services",
19+
link: "project/" + $routeParams.project + "/browse/service-instances"
20+
},
21+
{
22+
title: $routeParams.instance
23+
}
24+
];
25+
26+
var watches = [];
27+
28+
/*var setDisplayName = function() {
29+
if(!$scope.serviceInstance || !$scope.serviceClasses) {
30+
return;
31+
}
32+
33+
$scope.displayName = $filter('serviceInstanceDisplayName')($scope.serviceInstance, $scope.serviceClasses);
34+
};*/
35+
36+
var setDescription = function() {
37+
if(!$scope.serviceInstance || !$scope.serviceClasses) {
38+
return;
39+
}
40+
41+
var serviceClassName = _.get($scope.serviceInstance.spec, 'serviceClassName');
42+
$scope.serviceClass = _.get($scope.serviceClasses, [serviceClassName]);
43+
$scope.plan = _.find(_.get($scope.serviceClass, 'plans'), {name: 'default'});
44+
};
45+
46+
var serviceResolved = function(service, action) {
47+
$scope.loaded = true;
48+
$scope.serviceInstance = service;
49+
50+
if (action === "DELETED") {
51+
$scope.alerts["deleted"] = {
52+
type: "warning",
53+
message: "This provisioned service has been deleted."
54+
};
55+
}
56+
57+
//setDisplayName();
58+
setDescription();
59+
};
60+
61+
ProjectsService
62+
.get($routeParams.project)
63+
.then(_.spread(function(project, context) {
64+
$scope.project = project;
65+
$scope.projectContext = context;
66+
67+
DataService
68+
.get({
69+
group: 'servicecatalog.k8s.io',
70+
resource: 'instances'
71+
}, $routeParams.instance, context, { errorNotification: false })
72+
.then(function(service) {
73+
74+
serviceResolved(service);
75+
76+
watches.push(DataService.watchObject({
77+
group: 'servicecatalog.k8s.io',
78+
resource: 'instances'
79+
}, $routeParams.instance, context, serviceResolved));
80+
81+
}, function(error) {
82+
$scope.loaded = true;
83+
$scope.alerts["load"] = {
84+
type: "error",
85+
message: "The service details could not be loaded.",
86+
details: $filter('getErrorDetails')(error)
87+
};
88+
});
89+
90+
DataService.list({
91+
group: 'servicecatalog.k8s.io',
92+
resource: 'serviceclasses'
93+
}, context, function(serviceClasses) {
94+
$scope.serviceClasses = serviceClasses.by('metadata.name');
95+
//setDisplayName();
96+
setDescription();
97+
});
98+
99+
$scope.$on('$destroy', function(){
100+
DataService.unwatchAll(watches);
101+
});
102+
103+
}));
104+
});

‎app/scripts/controllers/serviceInstances.js

+185
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
'use strict';
2+
3+
angular.module('openshiftConsole')
4+
.controller('ServiceInstancesController', function ($scope,
5+
$filter,
6+
$routeParams,
7+
APIService,
8+
BindingService,
9+
Constants,
10+
DataService,
11+
LabelFilter,
12+
Logger,
13+
ProjectsService) {
14+
$scope.alerts = $scope.alerts || {};
15+
$scope.applicationsByBinding = {};
16+
$scope.bindings = {};
17+
$scope.bindableServiceInstances = {};
18+
//$scope.bindingsByApplicationUID = {};
19+
$scope.bindingsByInstanceRef = {};
20+
$scope.emptyMessage = "Loading...";
21+
$scope.labelSuggestions = {};
22+
$scope.projectName = $routeParams.project;
23+
$scope.serviceClasses = {};
24+
$scope.serviceInstances = {};
25+
$scope.unfilteredServiceInstances = {};
26+
27+
var watches = [];
28+
29+
var updateFilter = function() {
30+
$scope.serviceInstances = LabelFilter.getLabelSelector().select($scope.unfilteredServiceInstances);
31+
};
32+
33+
var sortServiceInstances = function() {
34+
$scope.bindableServiceInstances = BindingService.filterBindableServiceInstances($scope.unfilteredServiceInstances, $scope.serviceClasses);
35+
$scope.unfilteredServiceInstances = BindingService.sortServiceInstances($scope.unfilteredServiceInstances, $scope.serviceClasses);
36+
};
37+
38+
var groupBindings = function() {
39+
// Build two maps:
40+
// - Bindings by the UID of the target object
41+
// - API objects by binding name
42+
/*
43+
state.bindingsByApplicationUID = {};
44+
state.applicationsByBinding = {};
45+
//state.deleteableBindingsByApplicationUID = {};
46+
47+
// If there are no bindings, nothing to do.
48+
if (_.isEmpty(state.bindings)) {
49+
return;
50+
}
51+
52+
// All objects that can be a target for bindings.
53+
var objectsByKind = [
54+
overview.deployments,
55+
overview.deploymentConfigs,
56+
overview.vanillaReplicationControllers,
57+
overview.vanillaReplicaSets,
58+
overview.statefulSets
59+
];
60+
61+
// Make sure all the binding targets have loaded first.
62+
if (_.some(objectsByKind, function(collection) { return !collection; })) {
63+
return;
64+
}
65+
66+
// Build a map of pod preset selectors by binding name.
67+
var podPresetSelectors = {};
68+
_.each(state.bindings, function(binding) {
69+
var podPresetSelector = _.get(binding, 'spec.alphaPodPresetTemplate.selector');
70+
if (podPresetSelector) {
71+
podPresetSelectors[binding.metadata.name] = new LabelSelector(podPresetSelector);
72+
}
73+
});
74+
75+
_.each(objectsByKind, function(collection) {
76+
_.each(collection, function(apiObject) {
77+
// Key by UID since name is not unique across different kinds.
78+
var applicationUID = getUID(apiObject);
79+
80+
// Create a selector for the potential binding target to check if the
81+
// pod preset covers the selector.
82+
var applicationSelector = new LabelSelector(_.get(apiObject, 'spec.selector'));
83+
state.bindingsByApplicationUID[applicationUID] = [];
84+
state.deleteableBindingsByApplicationUID[applicationUID] = [];
85+
86+
// Look at each pod preset selector to see if it covers this API object selector.
87+
_.each(podPresetSelectors, function(podPresetSelector, bindingName) {
88+
if (podPresetSelector.covers(applicationSelector)) {
89+
// Keep a map of the target UID to the binding and the binding to
90+
// the target. We want to show bindings both in the "application"
91+
// object rows and the service instance rows.
92+
state.bindingsByApplicationUID[applicationUID].push(state.bindings[bindingName]);
93+
if (!_.get(state.bindings[bindingName], 'metadata.deletionTimestamp')) {
94+
state.deleteableBindingsByApplicationUID[applicationUID].push(state.bindings[bindingName]);
95+
}
96+
state.applicationsByBinding[bindingName] = state.applicationsByBinding[bindingName] || [];
97+
state.applicationsByBinding[bindingName].push(apiObject);
98+
}
99+
});
100+
});
101+
});
102+
103+
$scope.bindingsByInstanceRef = _.reduce(state.bindingsByInstanceRef, function(result, bindingList, key) {
104+
result[key] = _.sortBy(bindingList, function(binding) {
105+
var apps = _.get(state.applicationsByBinding, [binding.metadata.name]);
106+
var firstName = _.get(_.head(apps), ['metadata', 'name']);
107+
return firstName || binding.metadata.name;
108+
});
109+
return result;
110+
}, {});*/
111+
};
112+
113+
ProjectsService
114+
.get($routeParams.project)
115+
.then(_.spread(function(project, context) {
116+
$scope.project = project;
117+
$scope.projectContext = context;
118+
119+
watches.push(DataService.watch({
120+
group: 'servicecatalog.k8s.io',
121+
resource: 'bindings'
122+
}, context, function(bindings) {
123+
$scope.bindings = bindings.by('metadata.name');
124+
$scope.bindingsByInstanceRef = _.groupBy($scope.bindings, 'spec.instanceRef.name');
125+
groupBindings();
126+
//refreshSecrets(context);
127+
}));
128+
129+
watches.push(DataService.watch({
130+
group: 'servicecatalog.k8s.io',
131+
resource: 'instances'
132+
}, context, function(serviceInstances) {
133+
$scope.emptyMessage = "No provisioned services to show";
134+
$scope.unfilteredServiceInstances = serviceInstances.by('metadata.name');
135+
136+
//_.each($scope.unfilteredServiceInstances, function (instance) {
137+
// var notifications = ResourceAlertsService.getServiceInstanceAlerts(instance);
138+
// setNotifications(instance, notifications);
139+
//});
140+
141+
sortServiceInstances();
142+
updateFilter();
143+
updateFilterWarning();
144+
145+
LabelFilter.addLabelSuggestionsFromResources($scope.unfilteredServiceInstances, $scope.labelSuggestions);
146+
LabelFilter.setLabelSuggestions($scope.labelSuggestions);
147+
148+
Logger.log("provisioned services (subscribe)", $scope.unfilteredServiceInstances);
149+
}));
150+
151+
DataService.list({
152+
group: 'servicecatalog.k8s.io',
153+
resource: 'serviceclasses'
154+
}, context, function(serviceClasses) {
155+
$scope.serviceClasses = serviceClasses.by('metadata.name');
156+
sortServiceInstances();
157+
updateFilter();
158+
});
159+
160+
function updateFilterWarning() {
161+
if (!LabelFilter.getLabelSelector().isEmpty() && _.isEmpty($scope.serviceInstances) && !_.isEmpty($scope.unfilteredServiceInstances)) {
162+
$scope.alerts["all-instances-filtered"] = {
163+
type: "warning",
164+
details: "The active filters are hiding all provisioned services."
165+
};
166+
}
167+
else {
168+
delete $scope.alerts["all-instances-filtered"];
169+
}
170+
}
171+
172+
LabelFilter.onActiveFiltersChanged(function(labelSelector) {
173+
// trigger a digest loop
174+
$scope.$apply(function() {
175+
$scope.serviceInstances = labelSelector.select($scope.unfilteredServiceInstances);
176+
updateFilterWarning();
177+
});
178+
});
179+
180+
$scope.$on('$destroy', function(){
181+
DataService.unwatchAll(watches);
182+
});
183+
184+
}));
185+
});

‎app/scripts/directives/overview/serviceBinding.js

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
bindings: {
1010
namespace: '<',
1111
binding: '<',
12+
refApiObject: '<?',
1213
serviceClasses: '<',
1314
serviceInstances: '<'
1415
},

‎app/scripts/directives/resourceServiceBindings.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,11 @@ function ResourceServiceBindings($filter, DataService, BindingService, CatalogSe
3939
return;
4040
}
4141

42-
// Get only those bindings applicable to the resource
43-
ctrl.bindings = BindingService.getBindingsForResource(ctrl.bindings, ctrl.apiObject);
42+
if (_.get(ctrl.apiObject, 'kind') === 'Instance') {
43+
ctrl.bindings = _.filter(ctrl.bindings, ['spec.instanceRef.name', _.get(ctrl.apiObject, 'metadata.name')]);
44+
} else {
45+
ctrl.bindings = BindingService.getBindingsForResource(ctrl.bindings, ctrl.apiObject);
46+
}
4447
};
4548

4649
var sortServiceInstances = function() {

‎app/scripts/filters/canI.js

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ angular
2929
'imageStreams': [
3030
{group: '', resource: 'imagestreams', verbs: ['update', 'delete']}
3131
],
32+
'instances': [
33+
{group: 'servicecatalog.k8s.io', resource: 'instances', verbs: ['update', 'create', 'delete']}
34+
],
3235
'persistentVolumeClaims': [
3336
{group: '', resource: 'persistentvolumeclaims', verbs: ['update', 'delete']}
3437
],

‎app/scripts/filters/resources.js

+16
Original file line numberDiff line numberDiff line change
@@ -1328,4 +1328,20 @@ angular.module('openshiftConsole')
13281328
var serviceClassDisplayName = _.get(serviceClasses, [serviceClassName, 'externalMetadata', 'displayName']);
13291329
return serviceClassDisplayName || serviceClassName || instanceName;
13301330
};
1331+
})
1332+
.filter('serviceInstanceStatus', function(isServiceInstanceReadyFilter) {
1333+
return function(instance) {
1334+
var status = 'Failed';
1335+
1336+
if (isServiceInstanceReadyFilter(instance)) {
1337+
status = 'Succeeded';
1338+
}
1339+
1340+
return status;
1341+
};
1342+
})
1343+
.filter('serviceInstanceMessage', function(statusConditionFilter) {
1344+
return function(instance) {
1345+
return _.get(statusConditionFilter(instance, 'Ready'), 'message');
1346+
};
13311347
});

0 commit comments

Comments
 (0)