fix some pending policy (stolostron#893)

Signed-off-by: ldpliu <[email protected]>
yanmxa · Apr 23, 2024 · 112b353 · 112b353
1 parent f3a5026
commit 112b353
Show file tree

Hide file tree

Showing 8 changed files with 839 additions and 821 deletions.
diff --git a/agent/pkg/status/controller/event/local_root_policy_emitter.go b/agent/pkg/status/controller/event/local_root_policy_emitter.go
@@ -82,7 +82,7 @@ func policyEventPredicate(ctx context.Context, obj client.Object, c client.Clien
 	// get policy
 	policy, err := getInvolvePolicy(ctx, c, evt)
 	if err != nil {
-		log.Error(err, "failed to get involved policy", "event", evt.Namespace+"/"+evt.Name)
+		log.Info("failed to get involved policy", "event", evt.Namespace+"/"+evt.Name, "error", err.Error())
 		return nil, false
 	}
 	return policy, true

diff --git a/manager/pkg/statussyncer/syncers/local_policy_compliance_handler.go b/manager/pkg/statussyncer/syncers/local_policy_compliance_handler.go
@@ -92,7 +92,7 @@ func handleCompliance(log logr.Logger, ctx context.Context, evt *cloudevents.Eve
 
 		// handle pending compliance clusters of the policy
 		pendingCompliances := newLocalCompliances(leafHub, policyID, database.Pending,
-			eventCompliance.PendingComplianceClusters, complianceClustersFromDB.GetClusters(database.Pending))
+			eventCompliance.PendingComplianceClusters, allClustersOnDB)
 
 		batchLocalCompliances := []models.LocalStatusCompliance{}
 		batchLocalCompliances = append(batchLocalCompliances, compliantCompliances...)

diff --git a/operator/pkg/controllers/hubofhubs/manifests/grafana/acm-global-adhoc-investigation.yaml b/operator/pkg/controllers/hubofhubs/manifests/grafana/acm-global-adhoc-investigation.yaml
@@ -309,7 +309,7 @@ data:
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "yellow",
+                    "color": "orange",
                     "value": null
                   }
                 ]