From f0bd8eae11fc653c507c072f80d0e759a8f7e270 Mon Sep 17 00:00:00 2001 From: Shuting Zhao Date: Tue, 19 May 2020 12:41:13 -0700 Subject: [PATCH] clarify names --- pkg/engine/utils.go | 6 +++--- pkg/userinfo/roleRef.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/engine/utils.go b/pkg/engine/utils.go index 035c2d5f07..4a7cc23257 100644 --- a/pkg/engine/utils.go +++ b/pkg/engine/utils.go @@ -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")) } diff --git a/pkg/userinfo/roleRef.go b/pkg/userinfo/roleRef.go index f0c11f2fd0..78e4d0a7dc 100644 --- a/pkg/userinfo/roleRef.go +++ b/pkg/userinfo/roleRef.go @@ -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 }