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

Revert "fix: metrics with invalid validationMode (#4198)" (#4241)

This reverts commit 65c100566c.
This commit is contained in:
shuting 2022-07-20 23:22:03 +08:00 committed by GitHub
parent 65c100566c
commit 7a2045bc11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions

View file

@ -48,12 +48,10 @@ func registerPolicyExecutionDurationMetric(
//policy - policy related data
//engineResponse - resource and rule related data
func ProcessEngineResponse(m *metrics.MetricsConfig, policy kyvernov1.PolicyInterface, engineResponse response.EngineResponse, executionCause metrics.RuleExecutionCause, generateRuleLatencyType string, resourceRequestOperation metrics.ResourceRequestOperation) error {
name, namespace, policyType, backgroundMode, _, _ := metrics.GetPolicyInfos(policy)
validationMode, err := metrics.ParsePolicyValidationMode(engineResponse.GetValidationFailureAction())
name, namespace, policyType, backgroundMode, validationMode, err := metrics.GetPolicyInfos(policy)
if err != nil {
return err
}
resourceSpec := engineResponse.PolicyResponse.Resource
resourceKind := resourceSpec.Kind
resourceNamespace := resourceSpec.Namespace

View file

@ -43,12 +43,10 @@ func registerPolicyResultsMetric(
//policy - policy related data
//engineResponse - resource and rule related data
func ProcessEngineResponse(m *metrics.MetricsConfig, policy kyvernov1.PolicyInterface, engineResponse response.EngineResponse, executionCause metrics.RuleExecutionCause, resourceRequestOperation metrics.ResourceRequestOperation) error {
name, namespace, policyType, backgroundMode, _, _ := metrics.GetPolicyInfos(policy)
validationMode, err := metrics.ParsePolicyValidationMode(engineResponse.GetValidationFailureAction())
name, namespace, policyType, backgroundMode, validationMode, err := metrics.GetPolicyInfos(policy)
if err != nil {
return err
}
resourceSpec := engineResponse.PolicyResponse.Resource
resourceKind := resourceSpec.Kind
resourceNamespace := resourceSpec.Namespace