Bug: crash-looping config-policy-controller-uninstaller

Signed-off-by: Yi Rae Kim <yikim@redhat.com>
(cherry picked from commit 7c79594)

controllers/configurationpolicy_controller.go

@@ -195,7 +195,14 @@ func (r *ConfigurationPolicyReconciler) PeriodicallyExecConfigPolicies(
  _ = r.refreshDiscoveryInfo()
  }
 
- if discoveryErr == nil {
+ cleanupImmediately, err := r.cleanupImmediately()
+ if err != nil {
+ log.Error(err, "Failed to determine if it's time to cleanup immediately")
+
+ skipLoop = true
+ }
+
+ if !skipLoop && (discoveryErr == nil || cleanupImmediately) {
  // This retrieves the policies from the controller-runtime cache populated by the watch.
  err := r.List(context.TODO(), &policiesList)
  if err != nil {
@@ -207,13 +214,6 @@ func (r *ConfigurationPolicyReconciler) PeriodicallyExecConfigPolicies(
  skipLoop = true
  }
 
- cleanupImmediately, err := r.cleanupImmediately()
- if err != nil {
- log.Error(err, "Failed to determine if it's time to cleanup immediately")
-
- skipLoop = true
- }
-
  // This is done every loop cycle since the channel needs to be variable in size to account for the number of
  // policies changing.
  policyQueue := make(chan *policyv1.ConfigurationPolicy, len(policiesList.Items))