Skip to content

Commit 21526b4

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): e3d3db7a2dc0ac26a515d6c11ef052062d903488
1 parent 2d722f7 commit 21526b4

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

pkg/assets/bindata.go

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4010,17 +4010,17 @@ b[a.tag] = b[a.tag] || {}, b[a.tag].name = a.tag, b[a.tag].status = angular.copy
40104010
}
40114011
};
40124012
}), angular.module("openshiftConsole").factory("MembershipService", [ "$filter", function(a) {
4013-
var b = (a("annotation"), function(a, b) {
4013+
var b = a("annotation"), c = function(a, b) {
40144014
return 1 === _.filter(b, function(b) {
40154015
return _.some(b.subjects, {
40164016
name:a
40174017
});
40184018
}).length;
4019-
}), c = function() {
4019+
}, d = function() {
40204020
return _.reduce(_.slice(arguments), function(a, b, c) {
40214021
return b ? _.isEqual(c, 0) ? b :a + "-" + b :a;
40224022
}, "");
4023-
}, d = function() {
4023+
}, e = function() {
40244024
return {
40254025
User:{
40264026
kind:"User",
@@ -4059,39 +4059,39 @@ name:"SystemGroup",
40594059
subjects:{}
40604060
}
40614061
};
4062-
}, e = function(a, b) {
4063-
var e = _.reduce(a, function(a, d) {
4064-
var e = c(d.roleRef.namespace ? "Role" :"ClusterRole", d.roleRef.name);
4065-
return _.each(d.subjects, function(d) {
4066-
var f = c(d.namespace, d.name);
4067-
a[d.kind].subjects[f] || (a[d.kind].subjects[f] = {
4068-
name:d.name,
4069-
namespace:d.namespace,
4062+
}, f = function(a, b) {
4063+
var c = _.reduce(a, function(a, c) {
4064+
var e = d(c.roleRef.namespace ? "Role" :"ClusterRole", c.roleRef.name);
4065+
return _.each(c.subjects, function(c) {
4066+
var f = d(c.namespace, c.name);
4067+
a[c.kind].subjects[f] || (a[c.kind].subjects[f] = {
4068+
name:c.name,
4069+
namespace:c.namespace,
40704070
roles:{}
4071-
}), _.includes(a[d.kind].subjects[f].roles, e) || (a[d.kind].subjects[f].roles[e] = b[e]);
4071+
}), _.includes(a[c.kind].subjects[f].roles, e) || (a[c.kind].subjects[f].roles[e] = b[e]);
40724072
}), a;
4073-
}, d());
4074-
return _.sortBy(e, "sortOrder");
4075-
}, f = function(a) {
4076-
return _.sortBy(a, "metadata.name");
4073+
}, e());
4074+
return _.sortBy(c, "sortOrder");
40774075
}, g = function(a) {
4076+
return _.sortBy(a, "metadata.name");
4077+
}, h = function(a) {
40784078
return _.filter(a, function(a) {
4079-
return _.isEqual(a.metadata.name, "system:image-puller") || _.isEqual(a.metadata.name, "system:image-pusher") || _.isEqual(a.metadata.name, "system:image-builder") || _.isEqual(a.metadata.name, "system:deployer") || !_.startsWith(a.metadata.name, "cluster-") && !_.startsWith(a.metadata.name, "system:") && !_.startsWith(a.metadata.name, "registry-") && !_.startsWith(a.metadata.name, "self-");
4079+
return "true" !== b(a, "systemOnly");
40804080
});
4081-
}, h = function(a) {
4081+
}, i = function(a) {
40824082
return _.reduce(a, function(a, b) {
4083-
return a[c(b.kind, b.metadata.name)] = b, a;
4083+
return a[d(b.kind, b.metadata.name)] = b, a;
40844084
}, {});
4085-
}, i = function(a, b) {
4086-
return _.merge(h(a), h(b));
4085+
}, j = function(a, b) {
4086+
return _.merge(i(a), i(b));
40874087
};
40884088
return {
4089-
sortRoles:f,
4090-
filterRoles:g,
4091-
mapRolesForUI:i,
4092-
isLastRole:b,
4093-
getSubjectKinds:d,
4094-
mapRolebindingsForUI:e
4089+
sortRoles:g,
4090+
filterRoles:h,
4091+
mapRolesForUI:j,
4092+
isLastRole:c,
4093+
getSubjectKinds:e,
4094+
mapRolebindingsForUI:f
40954095
};
40964096
} ]), angular.module("openshiftConsole").factory("RolesService", [ "$q", "DataService", function(a, b) {
40974097
var c = function(c) {
@@ -14893,7 +14893,8 @@ jenkinsBuildURL:[ "openshift.io/jenkins-build-uri" ],
1489314893
jenkinsLogURL:[ "openshift.io/jenkins-log-url" ],
1489414894
jenkinsStatus:[ "openshift.io/jenkins-status-json" ],
1489514895
idledAt:[ "idling.alpha.openshift.io/idled-at" ],
14896-
idledPreviousScale:[ "idling.alpha.openshift.io/previous-scale" ]
14896+
idledPreviousScale:[ "idling.alpha.openshift.io/previous-scale" ],
14897+
systemOnly:[ "authorization.openshift.io/system-only" ]
1489714898
};
1489814899
return function(b) {
1489914900
return a[b] || null;

0 commit comments

Comments
 (0)