Skip to content

Commit

Permalink
Remove confusing Undetermined compliance state
Browse files Browse the repository at this point in the history
The situation where this compliance state was being used was appearing
if the ConfigurationPolicy had no templates. Marking it as Unknown is
better, since at least that is a value listed in the api folder...

This change also makes this situation create a compliance event, since
the framework *needs* a new event in all situations when a policy, else
when it transitions from Pending to something else, it will not update.

Refs:
 - https://issues.redhat.com/browse/ACM-2263

Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
  • Loading branch information
JustinKuli authored and openshift-merge-robot committed Dec 5, 2022
1 parent a1554d5 commit 423fd34
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions controllers/configurationpolicy_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -2407,7 +2407,7 @@ func (r *ConfigurationPolicyReconciler) addForUpdate(policy *policyv1.Configurat
if policy.ObjectMeta.DeletionTimestamp != nil {
policy.Status.ComplianceState = policyv1.Terminating
} else if len(policy.Status.CompliancyDetails) == 0 {
policy.Status.ComplianceState = "Undetermined"
policy.Status.ComplianceState = policyv1.UnknownCompliancy
} else if compliant {
policy.Status.ComplianceState = policyv1.Compliant
} else {
Expand Down Expand Up @@ -2443,7 +2443,7 @@ func (r *ConfigurationPolicyReconciler) updatePolicyStatus(
policy *policyv1.ConfigurationPolicy,
sendEvent bool,
) (*policyv1.ConfigurationPolicy, error) {
if policy.Status.ComplianceState != "Undetermined" && sendEvent {
if sendEvent {
log.V(1).Info("Sending parent policy compliance event")

// If the compliance event can't be created, then don't update the ConfigurationPolicy
Expand Down Expand Up @@ -2516,7 +2516,7 @@ func (r *ConfigurationPolicyReconciler) sendComplianceEvent(instance *policyv1.C
ReportingInstance: r.InstanceName,
}

if instance.Status.ComplianceState == policyv1.NonCompliant {
if instance.Status.ComplianceState != policyv1.Compliant {
event.Type = "Warning"
}

Expand All @@ -2525,8 +2525,8 @@ func (r *ConfigurationPolicyReconciler) sendComplianceEvent(instance *policyv1.C

// convertPolicyStatusToString to be able to pass the status as event
func convertPolicyStatusToString(plc *policyv1.ConfigurationPolicy) (results string) {
if plc.Status.ComplianceState == "" {
return "ComplianceState is still undetermined"
if plc.Status.ComplianceState == "" || plc.Status.ComplianceState == policyv1.UnknownCompliancy {
return "ComplianceState is still unknown"
}

result := string(plc.Status.ComplianceState)
Expand Down

0 comments on commit 423fd34

Please sign in to comment.