@@ -4010,17 +4010,17 @@ b[a.tag] = b[a.tag] || {}, b[a.tag].name = a.tag, b[a.tag].status = angular.copy
4010
4010
}
4011
4011
};
4012
4012
}), 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) {
4014
4014
return 1 === _.filter(b, function(b) {
4015
4015
return _.some(b.subjects, {
4016
4016
name:a
4017
4017
});
4018
4018
}).length;
4019
- }), c = function() {
4019
+ }, d = function() {
4020
4020
return _.reduce(_.slice(arguments), function(a, b, c) {
4021
4021
return b ? _.isEqual(c, 0) ? b :a + "-" + b :a;
4022
4022
}, "");
4023
- }, d = function() {
4023
+ }, e = function() {
4024
4024
return {
4025
4025
User:{
4026
4026
kind:"User",
@@ -4059,39 +4059,39 @@ name:"SystemGroup",
4059
4059
subjects:{}
4060
4060
}
4061
4061
};
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,
4070
4070
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]);
4072
4072
}), 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");
4077
4075
}, g = function(a) {
4076
+ return _.sortBy(a, "metadata.name");
4077
+ }, h = function(a) {
4078
4078
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 ");
4080
4080
});
4081
- }, h = function(a) {
4081
+ }, i = function(a) {
4082
4082
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;
4084
4084
}, {});
4085
- }, i = function(a, b) {
4086
- return _.merge(h (a), h (b));
4085
+ }, j = function(a, b) {
4086
+ return _.merge(i (a), i (b));
4087
4087
};
4088
4088
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
4095
4095
};
4096
4096
} ]), angular.module("openshiftConsole").factory("RolesService", [ "$q", "DataService", function(a, b) {
4097
4097
var c = function(c) {
@@ -14893,7 +14893,8 @@ jenkinsBuildURL:[ "openshift.io/jenkins-build-uri" ],
14893
14893
jenkinsLogURL:[ "openshift.io/jenkins-log-url" ],
14894
14894
jenkinsStatus:[ "openshift.io/jenkins-status-json" ],
14895
14895
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" ]
14897
14898
};
14898
14899
return function(b) {
14899
14900
return a[b] || null;
0 commit comments