ConfigurationPolicy error message for a missing namespace is incomplete

Signed-off-by: Chunxi Luo <chuluo@redhat.com>

controllers/configurationpolicy_controller.go

@@ -422,6 +422,7 @@ func (r *ConfigurationPolicyReconciler) getObjectTemplateDetails(
  templateObjs := make([]objectTemplateDetails, len(plc.Spec.ObjectTemplates))
  selectedNamespaces := []string{}
  queryNamespaces := false
+ kindWithoutNS := ""
 
  for idx, objectT := range plc.Spec.ObjectTemplates {
  unstruct, err := unmarshalFromJSON(objectT.ObjectDefinition.Raw)
@@ -437,22 +438,30 @@ func (r *ConfigurationPolicyReconciler) getObjectTemplateDetails(
 
  if templateObjs[idx].isNamespaced && templateObjs[idx].namespace == "" {
  queryNamespaces = true
+ kindWithoutNS = kindWithoutNS + "|" + templateObjs[idx].kind
  }
  }
 
  // If required, query for namespaces specified in NamespaceSelector for objects to use
  if queryNamespaces {
  // Retrieve the namespaces based on filters in NamespaceSelector
  selector := plc.Spec.NamespaceSelector
+ plcName := plc.GetName()
  // If MatchLabels/MatchExpressions/Include were not provided, return no namespaces
  if selector.MatchLabels == nil && selector.MatchExpressions == nil && len(selector.Include) == 0 {
- log.Info("namespaceSelector is empty. Skipping namespace retrieval.")
+ log.Info(
+ "Policy name:%s && Kind:%s - namespaceSelector is empty. Skipping namespace retrieval.",
+ plcName,
+ kindWithoutNS,
+ )
  } else {
  // If an error occurred in the NamespaceSelector, update the policy status and abort
  var err error
  selectedNamespaces, err = common.GetSelectedNamespaces(r.TargetK8sClient, selector)
  if err != nil {
- errMsg := "Error filtering namespaces with provided namespaceSelector"
+ errMsg := fmt.Sprintf(
+ "Policy name:%s && Kind:%s - Error filtering namespaces with provided namespaceSelector",
+ plcName, kindWithoutNS)
  log.Error(
  err, errMsg,
  "namespaceSelector", fmt.Sprintf("%+v", selector))

test/e2e/case19_ns_selector_test.go

@@ -62,17 +62,20 @@ var _ = Describe("Test object namespace selection", Ordered, func() {
  },
  "Malformed filepath in include": {
  "{\"include\":[\"*-[a-z-*\"]}",
- "Error filtering namespaces with provided namespaceSelector: " +
+ "Policy name:" + case19PolicyName +
+ " && Kind:|ConfigMap - Error filtering namespaces with provided namespaceSelector: " +
  "error parsing 'include' pattern '*-[a-z-*': syntax error in pattern",
  },
  "MatchExpressions with incorrect operator": {
  "{\"matchExpressions\":[{\"key\":\"name\",\"operator\":\"Seriously\"}]}",
- "Error filtering namespaces with provided namespaceSelector: " +
+ "Policy name:" + case19PolicyName +
+ " && Kind:|ConfigMap - Error filtering namespaces with provided namespaceSelector: " +
  "error parsing namespace LabelSelector: \"Seriously\" is not a valid pod selector operator",
  },
  "MatchExpressions with missing values": {
  "{\"matchExpressions\":[{\"key\":\"name\",\"operator\":\"In\",\"values\":[]}]}",
- "Error filtering namespaces with provided namespaceSelector: " +
+ "Policy name:" + case19PolicyName +
+ " && Kind:|ConfigMap - Error filtering namespaces with provided namespaceSelector: " +
  "error parsing namespace LabelSelector: " +
  "values: Invalid value: []string(nil): for 'in', 'notin' operators, values set can't be empty",
  },