Merge pull request kyverno#1305 from NoSkillGirl/bug/validation_error…

…_empty_set added annotations check in validation
realshuting · Nov 25, 2020 · d8062eb · d8062eb
2 parents 9399ade + 40b40fb
commit d8062eb
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pkg/policy/validate.go b/pkg/policy/validate.go
@@ -302,6 +302,17 @@ func doMatchAndExcludeConflict(rule kyverno.Rule) bool {
 		return false
 	}
 
+	if rule.MatchResources.Annotations != nil && rule.ExcludeResources.Annotations != nil {
+		if !(reflect.DeepEqual(rule.MatchResources.Annotations, rule.ExcludeResources.Annotations)) {
+			return false
+		}
+	}
+
+	if (rule.MatchResources.Annotations == nil && rule.ExcludeResources.Annotations != nil) ||
+		(rule.MatchResources.Annotations != nil && rule.ExcludeResources.Annotations == nil) {
+		return false
+	}
+
 	return true
 }