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: consider generateName when matching resources (#4945)

Browse source 
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
This commit is contained in:
Charles-Edouard Brétéché 2022-10-13 18:02:01 +02:00 • committed by GitHub
parent a62a0c1f9f
commit 56d90888e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1030 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/engine/utils.go
View file

@ -150,8 +150,13 @@ func doesResourceMatchConditionBlock(conditionBlock kyvernov1.ResourceDescriptio
}
}
resourceName := resource.GetName()
if resourceName == "" {
resourceName = resource.GetGenerateName()
}
if conditionBlock.Name != "" {
if !checkName(conditionBlock.Name, resource.GetName()) {
if !checkName(conditionBlock.Name, resourceName) {
errs = append(errs, fmt.Errorf("name does not match"))
}
}
@ -159,7 +164,7 @@ func doesResourceMatchConditionBlock(conditionBlock kyvernov1.ResourceDescriptio
if len(conditionBlock.Names) > 0 {
noneMatch := true
for i := range conditionBlock.Names {
if checkName(conditionBlock.Names[i], resource.GetName()) {
if checkName(conditionBlock.Names[i], resourceName) {
noneMatch = false
break
}

1023
pkg/engine/utils_test.go
View file

File diff suppressed because it is too large Load diff