diff --git a/app/scripts/constants.js b/app/scripts/constants.js index e257ff3fe8..4508e2a5a2 100644 --- a/app/scripts/constants.js +++ b/app/scripts/constants.js @@ -106,18 +106,25 @@ angular.extend(window.OPENSHIFT_CONSTANTS, { // and Import YAML/JSON. This typically shouldn't be customized but can be if necessary. SECURITY_CHECK_WHITELIST: [ {resource: 'buildconfigs', group: ''}, + {resource: 'buildconfigs', group: 'build.openshift.io'}, {resource: 'builds', group: ''}, + {resource: 'builds', group: 'build.openshift.io'}, {resource: 'configmaps', group: ''}, {resource: 'daemonsets', group: 'extensions'}, + {resource: 'deployments', group: 'apps'}, {resource: 'deployments', group: 'extensions'}, {resource: 'deploymentconfigs', group: ''}, + {resource: 'deploymentconfigs', group: 'apps.openshift.io'}, {resource: 'endpoints', group: ''}, {resource: 'events', group: ''}, {resource: 'horizontalpodautoscalers', group: 'autoscaling'}, {resource: 'horizontalpodautoscalers', group: 'extensions'}, {resource: 'imagestreamimages', group: ''}, + {resource: 'imagestreamimages', group: 'image.openshift.io'}, {resource: 'imagestreams', group: ''}, + {resource: 'imagestreams', group: 'image.openshift.io'}, {resource: 'imagestreamtags', group: ''}, + {resource: 'imagestreamtags', group: 'image.openshift.io'}, {resource: 'ingresses', group: 'extensions'}, {resource: 'jobs', group: 'batch'}, {resource: 'persistentvolumeclaims', group: ''}, @@ -126,6 +133,7 @@ angular.extend(window.OPENSHIFT_CONSTANTS, { {resource: 'replicasets', group: 'extensions'}, {resource: 'replicationcontrollers', group: ''}, {resource: 'routes', group: ''}, + {resource: 'routes', group: 'route.openshift.io'}, {resource: 'secrets', group: ''}, {resource: 'serviceaccounts', group: ''}, {resource: 'services', group: ''}, diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js index 64088c738c..71c35c484d 100644 --- a/dist/scripts/scripts.js +++ b/dist/scripts/scripts.js @@ -592,9 +592,15 @@ SECURITY_CHECK_WHITELIST:[ { resource:"buildconfigs", group:"" }, { +resource:"buildconfigs", +group:"build.openshift.io" +}, { resource:"builds", group:"" }, { +resource:"builds", +group:"build.openshift.io" +}, { resource:"configmaps", group:"" }, { @@ -602,11 +608,17 @@ resource:"daemonsets", group:"extensions" }, { resource:"deployments", +group:"apps" +}, { +resource:"deployments", group:"extensions" }, { resource:"deploymentconfigs", group:"" }, { +resource:"deploymentconfigs", +group:"apps.openshift.io" +}, { resource:"endpoints", group:"" }, { @@ -622,12 +634,21 @@ group:"extensions" resource:"imagestreamimages", group:"" }, { +resource:"imagestreamimages", +group:"image.openshift.io" +}, { resource:"imagestreams", group:"" }, { +resource:"imagestreams", +group:"image.openshift.io" +}, { resource:"imagestreamtags", group:"" }, { +resource:"imagestreamtags", +group:"image.openshift.io" +}, { resource:"ingresses", group:"extensions" }, { @@ -652,6 +673,9 @@ group:"" resource:"routes", group:"" }, { +resource:"routes", +group:"route.openshift.io" +}, { resource:"secrets", group:"" }, { diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js index 9ea659cac9..cd80b7c93e 100644 --- a/dist/scripts/vendor.js +++ b/dist/scripts/vendor.js @@ -36789,13 +36789,13 @@ if (b) { b.$el ? b.$el.empty() :b.$el = this._newNodeEl(b, c).addClass("node-" + this._elementId), b.$el.addClass(b["class"]), b.id && b.$el.attr("id", b.id), b.dataAttr && a.each(b.dataAttr, function(a, c) { b.$el.attr("data-" + a, c); }), b.$el.attr("data-nodeId", b.nodeId), b.tooltip && b.$el.attr("title", b.tooltip); -for (var d = 0; d < b.level - 1; d++) b.$el.append(this._template.indent.clone()); +for (var e = 0; e < b.level - 1; e++) b.$el.append(this._template.indent.clone()); if (b.$el.append(b.nodes || b.lazyLoad ? this._template.icon.expand.clone() :this._template.icon.empty.clone()), this._options.checkboxFirst ? (this._addCheckbox(b), this._addIcon(b), this._addImage(b)) :(this._addIcon(b), this._addImage(b), this._addCheckbox(b)), this._options.wrapNodeText) { -var e = this._template.text.clone(); -b.$el.append(e), e.append(b.text); +var g = this._template.text.clone(); +b.$el.append(g), g.append(b.text); } else b.$el.append(b.text); this._options.showTags && b.tags && a.each(b.tags, a.proxy(function(a, c) { -b.$el.append(this._template.badge.clone().addClass("string" == typeof b.tagsClass[a] ? b.tagsClass[a] :this._options.tagsClass).append(c)); +b.$el.append(this._template.badge.clone().addClass(("object" == typeof c ? c["class"] :d) || b.tagsClass || this._options.tagsClass).append(("object" == typeof c ? c.text :d) || c)); }, this)), this._setSelected(b, b.state.selected), this._setChecked(b, b.state.checked), this._setSearchResult(b, b.searchResult), this._setExpanded(b, b.state.expanded), this._setDisabled(b, b.state.disabled), this._setVisible(b, b.state.visible), this._triggerEvent("nodeRendered", b, f.options); } }, g.prototype._addCheckbox = function(a) {