move requeueing to syncHealthCheckHandler function

Author: cesnietor

pkg/controller/monitoring.go

@@ -39,7 +39,7 @@ const (
 	HealthReduceAvailabilityMessage = "Reduced Availability"
 )
 
-func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
+func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) (*miniov2.Tenant, error) {
 	// don't get the tenant cluster health if it doesn't have at least 1 pool initialized
 	oneInitialized := false
 	for _, pool := range tenant.Status.Pools {
@@ -49,25 +49,25 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
 	}
 	if !oneInitialized {
 		klog.Infof("'%s/%s' no pool is initialized", tenant.Namespace, tenant.Name)
-		return nil
+		return tenant, nil
 	}
 
 	tenantConfiguration, err := c.getTenantCredentials(context.Background(), tenant)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	adminClnt, err := tenant.NewMinIOAdmin(tenantConfiguration, c.getTransport())
 	if err != nil {
 		klog.Errorf("Error instantiating adminClnt '%s/%s': %v", tenant.Namespace, tenant.Name, err)
-		return err
+		return nil, err
 	}
 
 	aClnt, err := madmin.NewAnonymousClient(tenant.MinIOServerHostAddress(), tenant.TLS())
 	if err != nil {
 		// show the error and continue
 		klog.Infof("'%s/%s': %v", tenant.Namespace, tenant.Name, err)
-		return nil
+		return tenant, nil
 	}
 	aClnt.SetCustomTransport(c.getTransport())
 
@@ -79,7 +79,7 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
 	if err != nil {
 		// show the error and continue
 		klog.Infof("'%s/%s' Failed to get cluster health: %v", tenant.Namespace, tenant.Name, err)
-		return nil
+		return tenant, nil
 	}
 
 	tenant.Status.DrivesHealing = int32(healthResult.HealingDrives)
@@ -98,7 +98,7 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
 		LabelSelector: fmt.Sprintf("%s=%s", miniov2.TenantLabel, tenant.Name),
 	})
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	allPodsRunning := true
@@ -122,7 +122,7 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
 	if err != nil {
 		// show the error and continue
 		klog.Infof("'%s/%s' Failed to get storage info: %v", tenant.Namespace, tenant.Name, err)
-		return nil
+		return tenant, nil
 	}
 
 	// Add back "Usable Capacity" & "Internal" values in Tenant Status and in the UI
@@ -205,13 +205,8 @@ func (c *Controller) updateHealthStatusForTenant(tenant *miniov2.Tenant) error {
 			klog.Infof("'%s/%s' Can't update tenant status with tiers: %v", tenant.Namespace, tenant.Name, err)
 		}
 	}
-	// Add tenant to the health check queue again until is green again
-	if tenant.Status.HealthStatus != miniov2.HealthStatusGreen {
-		key := fmt.Sprintf("%s/%s", tenant.GetNamespace(), tenant.Name)
-		c.healthCheckQueue.Add(key)
-	}
 
-	return nil
+	return tenant, nil
 }
 
 // HealthResult holds the results from cluster/health query into MinIO
@@ -244,10 +239,16 @@ func (c *Controller) syncHealthCheckHandler(key string) (Result, error) {
 
 	tenant.EnsureDefaults()
 
-	if err = c.updateHealthStatusForTenant(tenant); err != nil {
+	tenant, err = c.updateHealthStatusForTenant(tenant)
+	if err != nil {
 		klog.Errorf("%v", err)
 		return WrapResult(Result{}, err)
 	}
 
+	// Add tenant to the health check queue again until is green again
+	if tenant != nil && tenant.Status.HealthStatus != miniov2.HealthStatusGreen {
+		c.healthCheckQueue.Add(key)
+	}
+
 	return WrapResult(Result{}, nil)
 }