1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-30 19:35:06 +00:00

[Cleanup] Disable PolicySkipped events (#4913)

* remove skip events

Signed-off-by: Anant Vijay <anantvijay3@gmail.com>

* update conditions

Signed-off-by: Anant Vijay <anantvijay3@gmail.com>

* improve conditions

Signed-off-by: Anant Vijay <anantvijay3@gmail.com>

* remove redundant function

Signed-off-by: Anant Vijay <anantvijay3@gmail.com>

Signed-off-by: Anant Vijay <anantvijay3@gmail.com>
Co-authored-by: Charles-Edouard Brétéché <charled.breteche@gmail.com>
This commit is contained in:
XDRAGON2002 2022-10-13 14:02:20 +05:30 committed by GitHub
parent 17ba925490
commit 03c41e7746
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 36 deletions

View file

@ -89,26 +89,6 @@ func NewResourceViolationEvent(source Source, reason Reason, engineResponse *res
}
}
func NewPolicySkippedEvent(source Source, reason Reason, engineResponse *response.EngineResponse, ruleResp *response.RuleResponse) Info {
var bldr strings.Builder
defer bldr.Reset()
resource := engineResponse.GetResourceSpec()
if resource.Namespace != "" {
fmt.Fprintf(&bldr, "%s %s/%s: %s", resource.Kind, resource.Namespace, resource.Name, ruleResp.Status.String())
} else {
fmt.Fprintf(&bldr, "%s %s: %s", resource.Kind, resource.Name, ruleResp.Status.String())
}
return Info{
Kind: getPolicyKind(engineResponse.Policy),
Name: engineResponse.PolicyResponse.Policy.Name,
Namespace: engineResponse.PolicyResponse.Policy.Namespace,
Reason: PolicySkipped.String(),
Source: source,
Message: bldr.String(),
}
}
func NewBackgroundFailedEvent(err error, policy, rule string, source Source, r *unstructured.Unstructured) []Info {
if r == nil {
return nil

View file

@ -89,12 +89,7 @@ func generateFailEventsPerEr(log logr.Logger, er *response.EngineResponse) []eve
"name", er.PolicyResponse.Resource.Name)
for i, rule := range er.PolicyResponse.Rules {
if rule.Status == response.RuleStatusPass {
continue
} else if rule.Status == response.RuleStatusSkip {
eventResource := event.NewPolicySkippedEvent(event.PolicyController, event.PolicySkipped, er, &er.PolicyResponse.Rules[i])
eventInfos = append(eventInfos, eventResource)
} else {
if rule.Status != response.RuleStatusPass && rule.Status != response.RuleStatusSkip {
eventResource := event.NewResourceViolationEvent(event.PolicyController, event.PolicyViolation, er, &er.PolicyResponse.Rules[i])
eventInfos = append(eventInfos, eventResource)

View file

@ -30,16 +30,9 @@ func GenerateEvents(engineResponses []*response.EngineResponse, blocked bool) []
events = append(events, e)
}
}
} else {
if er.IsSkipped() {
for i := range er.PolicyResponse.Rules {
e := event.NewPolicySkippedEvent(event.AdmissionController, event.PolicySkipped, er, &er.PolicyResponse.Rules[i])
events = append(events, e)
}
} else {
e := event.NewPolicyAppliedEvent(event.AdmissionController, er)
events = append(events, e)
}
} else if !er.IsSkipped() {
e := event.NewPolicyAppliedEvent(event.AdmissionController, er)
events = append(events, e)
}
}