remove namespace check in policy validation

kyverno · Nov 16, 2020 · 63e11c2 · 63e11c2
1 parent 9d7c304
commit 63e11c2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/pkg/policy/generate/validate.go b/pkg/policy/generate/validate.go
@@ -80,9 +80,7 @@ func (g *Generate) validateClone(c kyverno.CloneFrom, kind string) (string, erro
 	if c.Name == "" {
 		return "name", fmt.Errorf("name cannot be empty")
 	}
-	if c.Namespace == "" {
-		return "namespace", fmt.Errorf("namespace cannot be empty")
-	}
+
 	namespace := c.Namespace
 	// Skip if there is variable defined
 	if !variables.IsVariable(kind) && !variables.IsVariable(namespace) {

diff --git a/pkg/policyreport/reportcontroller.go b/pkg/policyreport/reportcontroller.go
@@ -261,6 +261,12 @@ func (g *ReportGenerator) syncHandler(key string) error {
 func (g *ReportGenerator) createReportIfNotPresent(namespace string, new *unstructured.Unstructured, aggregatedRequests interface{}) (report interface{}, err error) {
 	log := g.log.WithName("createReportIfNotPresent")
 	if namespace != "" {
+		if ns, err := g.nsLister.Get(namespace); err == nil {
+			if ns.GetDeletionTimestamp() != nil {
+				return nil, nil
+			}
+		}
+
 		report, err = g.reportLister.PolicyReports(namespace).Get(generatePolicyReportName((namespace)))
 		if err != nil {
 			if apierrors.IsNotFound(err) && new != nil {
@@ -387,7 +393,9 @@ func (g *ReportGenerator) aggregateReports(namespace string) (
 	} else {
 		ns, err := g.nsLister.Get(namespace)
 		if err != nil {
-			return nil, nil, fmt.Errorf("unable to get namespace %s: %v", namespace, err)
+			if !apierrors.IsNotFound(err) {
+				return nil, nil, fmt.Errorf("unable to get namespace %s: %v", namespace, err)
+			}
 		}
 
 		selector := labels.SelectorFromSet(labels.Set(map[string]string{"namespace": namespace}))