Skip to content

Commit

Permalink
Enable service catalog, add dist for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@spadgett
spadgett committed Sep 11, 2017
1 parent 25802eb commit 9dd2ac0
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 55 deletions.
4 changes: 2 additions & 2 deletions app/scripts/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
DISABLE_GLOBAL_EVENT_WATCH: false,
ENABLE_TECH_PREVIEW_FEATURE: {
// Enable the new landing page and service catalog experience
service_catalog_landing_page: false,
service_catalog_landing_page: true,
// Set to `true` when the template service broker is enabled for the cluster in master-config.yaml
template_service_broker: false,
template_service_broker: true,
pod_presets: false
},

Expand Down
54 changes: 27 additions & 27 deletions dist/scripts/scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,11 @@ pollInterval: 6e4
}));
var o = t("canI");
s.SERVICE_CATALOG_ENABLED && o({
resource: "instances",
resource: "serviceinstances",
group: "servicecatalog.k8s.io"
}, "watch") && Ye.push(l.watch({
group: "servicecatalog.k8s.io",
resource: "instances"
resource: "serviceinstances"
}, a, function(e) {
V.serviceInstances = e.by("metadata.name"), _.each(V.serviceInstances, function(e) {
var t = k.getServiceInstanceAlerts(e);
Expand All @@ -460,11 +460,11 @@ ue(e, t);
poll: R,
pollInterval: 6e4
})), s.SERVICE_CATALOG_ENABLED && o({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "watch") && Ye.push(l.watch({
group: "servicecatalog.k8s.io",
resource: "bindings"
resource: "serviceinstancecredentials"
}, a, function(e) {
V.bindings = e.by("metadata.name"), P.bindingsByInstanceRef = _.groupBy(V.bindings, "spec.instanceRef.name"), Qe();
}, {
Expand All @@ -473,7 +473,7 @@ pollInterval: 6e4
})), l.list("limitranges", a, function(e) {
V.limitRanges = e.by("metadata.name");
}), s.SERVICE_CATALOG_ENABLED && o({
resource: "instances",
resource: "serviceinstances",
group: "servicecatalog.k8s.io"
}, "watch") && l.list({
group: "servicecatalog.k8s.io",
Expand Down Expand Up @@ -509,22 +509,22 @@ r.overlayPanelVisible = !1;
};
var d = function() {
t.unwatchAll(s), s = [], a.SERVICE_CATALOG_ENABLED && c({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "watch") && s.push(t.watch({
group: "servicecatalog.k8s.io",
resource: "bindings"
resource: "serviceinstancecredentials"
}, r.projectContext, function(e) {
r.bindings = e.by("metadata.name"), l();
}, {
poll: i,
pollInterval: 6e4
})), a.SERVICE_CATALOG_ENABLED && c({
resource: "instances",
resource: "serviceinstances",
group: "servicecatalog.k8s.io"
}, "watch") && (s.push(t.watch({
group: "servicecatalog.k8s.io",
resource: "instances"
resource: "serviceinstances"
}, r.projectContext, function(e) {
r.serviceInstances = e.by("metadata.name"), u();
}, {
Expand Down Expand Up @@ -602,8 +602,8 @@ DISABLE_CONFIRM_ON_EXIT: !1,
AVAILABLE_KINDS_BLACKLIST: [],
DISABLE_GLOBAL_EVENT_WATCH: !1,
ENABLE_TECH_PREVIEW_FEATURE: {
service_catalog_landing_page: !1,
template_service_broker: !1,
service_catalog_landing_page: !0,
template_service_broker: !0,
pod_presets: !1
},
SAMPLE_PIPELINE_TEMPLATE: {
Expand Down Expand Up @@ -3664,10 +3664,10 @@ group: "servicecatalog.k8s.io",
resource: "serviceclasses"
}) && t.apiInfo({
group: "servicecatalog.k8s.io",
resource: "instances"
resource: "serviceinstances"
}) && t.apiInfo({
group: "servicecatalog.k8s.io",
resource: "bindings"
resource: "serviceinstancecredentials"
}), i = {};
_.each(n.CATALOG_CATEGORIES, function(e) {
_.each(e.items, function(e) {
Expand Down Expand Up @@ -12400,7 +12400,7 @@ namespace: _.get(g.target, "metadata.namespace")
};
n.list({
group: "servicecatalog.k8s.io",
resource: "instances"
resource: "serviceinstances"
}, e).then(function(e) {
g.serviceInstances = e.by("metadata.name"), b();
});
Expand Down Expand Up @@ -12436,7 +12436,7 @@ s && (s(), s = void 0), c && (c(), c = void 0), g.nextTitle = "Close", g.wizardC
};
var k = function() {
if (g.serviceClasses) {
var e = "Instance" === g.target.kind ? g.target : g.serviceToBind;
var e = "ServiceInstance" === g.target.kind ? g.target : g.serviceToBind;
e && (g.serviceClass = g.serviceClasses[e.spec.serviceClassName], g.serviceClassName = e.spec.serviceClassName, g.plan = a.getPlanForInstance(e, g.serviceClass), g.parameterSchema = _.get(g.plan, "alphaBindingCreateParameterSchema"), o.hidden = !_.has(g.parameterSchema, "properties"), g.nextTitle = o.hidden ? "Bind" : "Next >");
}
};
Expand All @@ -12446,13 +12446,13 @@ group: "servicecatalog.k8s.io",
resource: "serviceclasses"
}, {}).then(function(e) {
g.serviceClasses = e.by("metadata.name"), k(), b();
}), "Instance" === g.target.kind ? (g.bindType = "secret-only", g.appToBind = null, g.serviceToBind = g.target, g.podPresets && S()) : (g.bindType = "application", g.appToBind = g.target, w());
}), "ServiceInstance" === g.target.kind ? (g.bindType = "secret-only", g.appToBind = null, g.serviceToBind = g.target, g.podPresets && S()) : (g.bindType = "application", g.appToBind = g.target, w());
}, g.$onChanges = function(e) {
e.project && !e.project.isFirstChange() && (g.projectDisplayName = t("displayName")(g.project));
}, g.$onDestroy = function() {
s && (s(), s = void 0), c && (c(), c = void 0), l && n.unwatch(l);
}, g.bindService = function() {
var e = "Instance" === g.target.kind ? g.target : g.serviceToBind, t = "application" === g.bindType ? g.appToBind : void 0, r = {
var e = "ServiceInstance" === g.target.kind ? g.target : g.serviceToBind, t = "application" === g.bindType ? g.appToBind : void 0, r = {
namespace: _.get(e, "metadata.namespace")
}, o = a.getServiceClassForInstance(e, g.serviceClasses);
a.bindService(e, t, o, g.parameterData).then(function(e) {
Expand Down Expand Up @@ -12481,7 +12481,7 @@ var a, r, o = this, i = t("serviceInstanceDisplayName"), s = function() {
var e = o.selectedBinding.metadata.name;
o.unboundApps = o.appsForBinding(e), n.delete({
group: "servicecatalog.k8s.io",
resource: "bindings"
resource: "serviceinstancecredentials"
}, e, r, {
propagationPolicy: null
}).then(_.noop, function(e) {
Expand All @@ -12500,7 +12500,7 @@ o.nextTitle = "Delete", c();
o.nextTitle = "Close", o.wizardComplete = !0, s(), l();
};
o.$onInit = function() {
var e = "Instance" === o.target.kind ? "Applications" : "Services";
var e = "ServiceInstance" === o.target.kind ? "Applications" : "Services";
o.displayName = i(o.target), o.steps = [ {
id: "deleteForm",
label: e,
Expand Down Expand Up @@ -13185,10 +13185,10 @@ var e = _.get(l, "apiObject.kind"), t = _.get(l, "apiObject.metadata.uid"), n =
switch (e) {
case "DeploymentConfig":
return !!u("deploymentconfigs/instantiate", "create") || !!u("deploymentconfigs", "update") || !(!l.current || !u("deploymentconfigs/log", "get")) || !(!p("pod_presets") || _.isEmpty(l.state.bindableServiceInstances) || !u({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "create")) || !(!p("pod_presets") || _.isEmpty(n) || !u({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "delete")) || l.showStartPipelineAction() || l.showStartBuildAction();

Expand All @@ -13197,10 +13197,10 @@ return !!u("pods/log", "get") || !!u("pods", "update");

default:
return !((!l.firstPod(l.current) || !u("pods/log", "get")) && !u(l.rgv, "update") && (!p("pod_presets") || _.isEmpty(l.state.bindableServiceInstances) || !u({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "create")) && (!p("pod_presets") || _.isEmpty(n) || !u({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "delete")));
}
Expand Down Expand Up @@ -13298,13 +13298,13 @@ e.bindings && (s.deleteableBindings = _.reject(s.bindings, "metadata.deletionTim
return e && _.get(s, [ "state", "secrets", e.spec.secretName ]);
}, s.actionsDropdownVisible = function() {
return !(_.get(s.apiObject, "metadata.deletionTimestamp") || (!s.isBindable || !i.canI({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "create")) && (_.isEmpty(s.deleteableBindings) || !i.canI({
resource: "bindings",
resource: "serviceinstancecredentials",
group: "servicecatalog.k8s.io"
}, "delete")) && !i.canI({
resource: "instances",
resource: "serviceinstances",
group: "servicecatalog.k8s.io"
}, "delete"));
}, s.closeOverlayPanel = function() {
Expand Down Expand Up @@ -13336,7 +13336,7 @@ return e;
}).result.then(function() {
o.hideNotification("deprovision-service-error"), n.delete({
group: "servicecatalog.k8s.io",
resource: "instances"
resource: "serviceinstances"
}, s.apiObject.metadata.name, {
namespace: s.apiObject.metadata.namespace
}, {
Expand Down
32 changes: 16 additions & 16 deletions dist/scripts/templates.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5662,11 +5662,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(


$templateCache.put('views/directives/bind-service/bind-service-form.html',
"<div ng-if=\"ctrl.target.kind !== 'Instance'\">\n" +
"<div ng-if=\"ctrl.target.kind !== 'ServiceInstance'\">\n" +
"<bind-application-form application-name=\"ctrl.target.metadata.name\" form-name=\"ctrl.selectionForm\" service-classes=\"ctrl.serviceClasses\" service-instances=\"ctrl.orderedServiceInstances\" service-to-bind=\"ctrl.serviceToBind\">\n" +
"</bind-application-form>\n" +
"</div>\n" +
"<div ng-if=\"ctrl.target.kind === 'Instance'\">\n" +
"<div ng-if=\"ctrl.target.kind === 'ServiceInstance'\">\n" +
"<bind-service-form selected-project=\"ctrl.project\" service-class=\"ctrl.serviceClass\" service-class-name=\"ctrl.serviceClassName\" form-name=\"ctrl.selectionForm\" show-pod-presets=\"ctrl.podPresets\" applications=\"ctrl.applications\" project-name=\"ctrl.projectDisplayName\" bind-type=\"ctrl.bindType\" app-to-bind=\"ctrl.appToBind\">\n" +
"</bind-service-form>\n" +
"</div>"
Expand Down Expand Up @@ -8804,7 +8804,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<h3>Service Bindings</h3>\n" +
"<overview-service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" namespace=\"$ctrl.projectContext.projectName\" binding=\"binding\" service-classes=\"$ctrl.serviceClasses\" service-instances=\"$ctrl.serviceInstances\">\n" +
"</overview-service-binding>\n" +
"<div ng-if=\"($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div ng-if=\"($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"$ctrl.createBinding()\" role=\"button\">\n" +
"<span class=\"pficon pficon-add-circle-o\" aria-hidden=\"true\"></span>\n" +
"Create Binding\n" +
Expand All @@ -8816,7 +8816,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<a href=\"./\">Browse Catalog</a>\n" +
"</div>\n" +
"</div>\n" +
"<div ng-if=\"!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div ng-if=\"!($ctrl.bindings | size) && ($ctrl.bindableServiceInstances | size) && !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<span>There are no service bindings.</span>\n" +
"</div>\n" +
"</div>\n" +
Expand Down Expand Up @@ -11585,12 +11585,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.bindableServiceInstances.length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"row.current && ('deploymentconfigs/log' | canI : 'get')\" role=\"menuitem\">\n" +
Expand Down Expand Up @@ -11621,12 +11621,12 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.bindableServiceInstances.length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')\" role=\"menuitem\">\n" +
Expand Down Expand Up @@ -12115,7 +12115,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</div>\n" +
"</div>\n" +
"<div class=\"service-binding-actions\" ng-if=\"!ctrl.binding.metadata.deletionTimestamp\">\n" +
"<delete-link ng-if=\"({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" label=\"Delete Binding\" kind=\"binding\" group=\"servicecatalog.k8s.io\" resource-name=\"{{$ctrl.binding.metadata.name}}\" project-name=\"{{$ctrl.binding.metadata.namespace}}\" stay-on-current-page=\"true\">\n" +
"<delete-link ng-if=\"({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" label=\"Delete Binding\" kind=\"binding\" group=\"servicecatalog.k8s.io\" resource-name=\"{{$ctrl.binding.metadata.name}}\" project-name=\"{{$ctrl.binding.metadata.namespace}}\" stay-on-current-page=\"true\">\n" +
"</delete-link>\n" +
"<a ng-if=\"('secrets' | canI : 'get')\" ng-href=\"{{$ctrl.binding.spec.secretName | navigateResourceURL : 'Secret' : $ctrl.namespace}}\">\n" +
"View Secret\n" +
Expand All @@ -12130,7 +12130,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"section-title hidden-xs\">Service Bindings</div>\n" +
"<overview-service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" namespace=\"$ctrl.namespace\" binding=\"binding\" service-classes=\"$ctrl.serviceClasses\" service-instances=\"$ctrl.serviceInstances\" secrets=\"$ctrl.secrets\">\n" +
"</overview-service-binding>\n" +
"<div ng-if=\"($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div ng-if=\"($ctrl.bindableServiceInstances | size) && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"$ctrl.createBinding()\" role=\"button\">\n" +
"<span class=\"pficon pficon-add-circle-o\" aria-hidden=\"true\"></span>\n" +
"Create Binding\n" +
Expand Down Expand Up @@ -12201,7 +12201,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div class=\"hidden-xs hidden-sm\">\n" +
"<span ng-if=\"!row.bindings.length\n" +
" && row.isBindable\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
" && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">\n" +
"<span class=\"pficon pficon-add-circle-o\" aria-hidden=\"true\"></span>\n" +
"Create Binding\n" +
Expand Down Expand Up @@ -12234,16 +12234,16 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"<div uib-dropdown ng-if=\"row.actionsDropdownVisible()\">\n" +
"<a href=\"\" uib-dropdown-toggle class=\"actions-dropdown-kebab\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
"<ul class=\"dropdown-menu dropdown-menu-right\" uib-dropdown-menu role=\"menu\">\n" +
"<li role=\"menuitem\" ng-if=\"row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<li role=\"menuitem\" ng-if=\"row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">\n" +
"Create Binding\n" +
"</a>\n" +
"</li>\n" +
"<li role=\"menuitem\" ng-if=\"row.deleteableBindings.length && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\">\n" +
"<li role=\"menuitem\" ng-if=\"row.deleteableBindings.length && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'delete')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\" ng-if=\"{resource: 'instances', group: 'servicecatalog.k8s.io'} | canI : 'delete'\">Delete</a>\n" +
"<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\" ng-if=\"{resource: 'serviceinstances', group: 'servicecatalog.k8s.io'} | canI : 'delete'\">Delete</a>\n" +
"</li>\n" +
"</ul>\n" +
"</div>\n" +
Expand Down Expand Up @@ -12326,15 +12326,15 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
"</span>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"row\" ng-if=\"row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div class=\"row\" ng-if=\"row.isBindable && ({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div class=\"col-sm-12\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">\n" +
"<span class=\"pficon pficon-add-circle-o\" aria-hidden=\"true\"></span>\n" +
"Create Binding\n" +
"</a>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"row\" ng-if=\"!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))\">\n" +
"<div class=\"row\" ng-if=\"!row.bindings.length && (!row.isBindable || !({resource: 'serviceinstancecredentials', group: 'servicecatalog.k8s.io'} | canI : 'create'))\">\n" +
"<div class=\"col-sm-12\">\n" +
"<em>No bindings</em>\n" +
"</div>\n" +
Expand Down

0 comments on commit 9dd2ac0

Please sign in to comment.