mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

fix variable substitution in NumericOperatorHandler

Browse source 
Signed-off-by: Shuting Zhao <shutting06@gmail.com>
This commit is contained in:
Shuting Zhao 2021-03-18 13:40:14 -07:00
parent 9a99cc3a33
commit 7502e5da98
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/api/kyverno/v1/utils.go
View file

@ -3,13 +3,18 @@ package v1
import (
"encoding/json"
"reflect"
"strings"
)
// HasAutoGenAnnotation checks if a policy has auto-gen annotation
func (p *ClusterPolicy) HasAutoGenAnnotation() bool {
annotations := p.GetAnnotations()
_, ok := annotations["pod-policies.kyverno.io/autogen-controllers"]
return ok
val, ok := annotations["pod-policies.kyverno.io/autogen-controllers"]
if ok && strings.ToLower(val) != "none" {
return true
}
return false
}
//HasMutateOrValidateOrGenerate checks for rule types

7
pkg/engine/variables/operator/numeric.go
View file

@ -45,12 +45,13 @@ func compareByCondition(key float64, value float64, op kyverno.ConditionOperator
}
func (noh NumericOperatorHandler) Evaluate(key, value interface{}) bool {
if key, err := noh.subHandler(noh.log, noh.ctx, key); err != nil {
var err error
if key, err = noh.subHandler(noh.log, noh.ctx, key); err != nil {
// Failed to resolve the variable
noh.log.Error(err, "Failed to resolve variable", "variable", key)
return false
}
if value, err := noh.subHandler(noh.log, noh.ctx, value); err != nil {
if value, err = noh.subHandler(noh.log, noh.ctx, value); err != nil {
// Failed to resolve the variable
noh.log.Error(err, "Failed to resolve variable", "variable", value)
return false
@ -133,7 +134,7 @@ func (noh NumericOperatorHandler) validateValueWithStringPattern(key string, val
if err == nil {
return noh.validateValueWithIntPattern(int64key, value)
}
noh.log.Error(fmt.Errorf("Parse Error: "), "Failed to parse both float64 and int64 from the string keyt")
noh.log.Error(err, "Failed to parse both float64 and int64 from the string keyt")
return false
}