Commit d406e8d0 by CD Cabrera

Updates for Service Instance & Bindings

Updates for service instances. Prep to allow updates
to chosen parameters for instance and bindings.
parent a120f820
...@@ -1124,6 +1124,10 @@ angular.module("openshiftCommonServices") ...@@ -1124,6 +1124,10 @@ angular.module("openshiftCommonServices")
}; };
var getBindingsForResource = function(bindings, apiObject) { var getBindingsForResource = function(bindings, apiObject) {
if (_.get(apiObject, 'kind') === 'Instance') {
return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
}
var podPresetSelectors = getPodPresetSelectorsForBindings(bindings); var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
// Create a selector for the potential binding target to check if the // Create a selector for the potential binding target to check if the
......
...@@ -2993,6 +2993,10 @@ angular.module("openshiftCommonServices") ...@@ -2993,6 +2993,10 @@ angular.module("openshiftCommonServices")
}; };
var getBindingsForResource = function(bindings, apiObject) { var getBindingsForResource = function(bindings, apiObject) {
if (_.get(apiObject, 'kind') === 'Instance') {
return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
}
var podPresetSelectors = getPodPresetSelectorsForBindings(bindings); var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
// Create a selector for the potential binding target to check if the // Create a selector for the potential binding target to check if the
......
...@@ -1199,6 +1199,7 @@ var podPresetSelector = _.get(binding, "spec.alphaPodPresetTemplate.selector"); ...@@ -1199,6 +1199,7 @@ var podPresetSelector = _.get(binding, "spec.alphaPodPresetTemplate.selector");
podPresetSelector && (podPresetSelectors[binding.metadata.name] = new LabelSelector(podPresetSelector)); podPresetSelector && (podPresetSelectors[binding.metadata.name] = new LabelSelector(podPresetSelector));
}), podPresetSelectors; }), podPresetSelectors;
}, getBindingsForResource = function(bindings, apiObject) { }, getBindingsForResource = function(bindings, apiObject) {
if ("Instance" === _.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 = []; var podPresetSelectors = getPodPresetSelectorsForBindings(bindings), applicationSelector = new LabelSelector(_.get(apiObject, "spec.selector")), resourceBindings = [];
return _.each(podPresetSelectors, function(podPresetSelector, bindingName) { return _.each(podPresetSelectors, function(podPresetSelector, bindingName) {
podPresetSelector.covers(applicationSelector) && resourceBindings.push(bindings[bindingName]); podPresetSelector.covers(applicationSelector) && resourceBindings.push(bindings[bindingName]);
......
...@@ -113,6 +113,10 @@ angular.module("openshiftCommonServices") ...@@ -113,6 +113,10 @@ angular.module("openshiftCommonServices")
}; };
var getBindingsForResource = function(bindings, apiObject) { var getBindingsForResource = function(bindings, apiObject) {
if (_.get(apiObject, 'kind') === 'Instance') {
return _.filter(bindings, ['spec.instanceRef.name', _.get(apiObject, 'metadata.name')]);
}
var podPresetSelectors = getPodPresetSelectorsForBindings(bindings); var podPresetSelectors = getPodPresetSelectorsForBindings(bindings);
// Create a selector for the potential binding target to check if the // Create a selector for the potential binding target to check if the
......
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