mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-28 10:28:36 +00:00
Code Activity

clarify names

Browse source
This commit is contained in:
Shuting Zhao 2020-05-19 12:41:13 -07:00
parent df452187bf
commit f0bd8eae11
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/engine/utils.go
View file

@ -18,7 +18,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
)
var ExcludeRoles = []string{"system:nodes", "system:serviceaccounts:kube-system", "system:kube-scheduler"}
var ExcludeUserInfo = []string{"system:nodes", "system:serviceaccounts:kube-system", "system:kube-scheduler"}
//EngineStats stores in the statistics for a single application of resource
type EngineStats struct {
@ -96,13 +96,13 @@ func doesResourceMatchConditionBlock(conditionBlock kyverno.ResourceDescription,
keys := append(admissionInfo.AdmissionUserInfo.Groups, admissionInfo.AdmissionUserInfo.Username)
if len(userInfo.Roles) > 0 &&
!DoesSliceContainsAnyOfTheseValues(keys, ExcludeRoles...) {
!DoesSliceContainsAnyOfTheseValues(keys, ExcludeUserInfo...) {
if !DoesSliceContainsAnyOfTheseValues(userInfo.Roles, admissionInfo.Roles...) {
errs = append(errs, fmt.Errorf("user info does not match roles for the given conditionBlock"))
}
}
if len(userInfo.ClusterRoles) > 0 &&
!DoesSliceContainsAnyOfTheseValues(keys, ExcludeRoles...) {
!DoesSliceContainsAnyOfTheseValues(keys, ExcludeUserInfo...) {
if !DoesSliceContainsAnyOfTheseValues(userInfo.ClusterRoles, admissionInfo.ClusterRoles...) {
errs = append(errs, fmt.Errorf("user info does not match clustersRoles for the given conditionBlock"))
}

2
pkg/userinfo/roleRef.go
View file

@ -22,7 +22,7 @@ const (
//GetRoleRef gets the list of roles and cluster roles for the incoming api-request
func GetRoleRef(rbLister rbaclister.RoleBindingLister, crbLister rbaclister.ClusterRoleBindingLister, request *v1beta1.AdmissionRequest) (roles []string, clusterRoles []string, err error) {
keys := append(request.UserInfo.Groups, request.UserInfo.Username)
if engine.DoesSliceContainsAnyOfTheseValues(keys, engine.ExcludeRoles...) {
if engine.DoesSliceContainsAnyOfTheseValues(keys, engine.ExcludeUserInfo...) {
return
}