Rebase adjustments

Author: Marcell Sevcsik

pkg/controller/periodic/periodic.go

@@ -29,7 +29,6 @@ type Controller struct {
 	statuses     map[string]*controllerstatus.Simple
 
 	initialDelay time.Duration
-
 }
 
 func New(configurator Configurator, recorder record.FlushInterface, gatherers map[string]gather.Interface) *Controller {
@@ -59,7 +58,6 @@ func (c *Controller) Sources() []controllerstatus.Interface {
 	return sources
 }
 
-
 func (c *Controller) Run(stopCh <-chan struct{}, initialDelay time.Duration) {
 	defer utilruntime.HandleCrash()
 	defer klog.Info("Shutting down")
@@ -84,7 +82,6 @@ func (c *Controller) Gather() {
 	}
 }
 
-
 func (c *Controller) runGatherer(name string) error {
 	gatherer, ok := c.gatherers[name]
 	if !ok {

pkg/gather/clusterconfig/0_gatherer.go

@@ -143,7 +143,7 @@ func (g *Gatherer) Gather(ctx context.Context, gatherList []string, recorder rec
 	return nil
 }
 
-func (g *Gatherer) startGathering(gatherList []string, errors* []string) ([]reflect.SelectCase, []time.Time, error) {
+func (g *Gatherer) startGathering(gatherList []string, errors *[]string) ([]reflect.SelectCase, []time.Time, error) {
 	var cases []reflect.SelectCase
 	var starts []time.Time
 	// Starts the gathers in Go routines

pkg/gather/clusterconfig/openshift_apiserver_operator_logs.go

@@ -24,25 +24,28 @@ import (
 // Response see https://docs.openshift.com/container-platform/4.6/rest_api/workloads_apis/pod-core-v1.html#apiv1namespacesnamespacepodsnamelog
 //
 // Location in archive: config/pod/{namespace-name}/logs/{pod-name}/errors.log
-func GatherOpenShiftAPIServerOperatorLogs(g *Gatherer) ([]record.Record, []error) {
+func GatherOpenShiftAPIServerOperatorLogs(g *Gatherer, ch chan<- gatherResult) {
+	defer close(ch)
 	messagesToSearch := []string{
 		"the server has received too many requests and has asked us",
 		"because serving request timed out and response had been started",
 	}
 
 	gatherKubeClient, err := kubernetes.NewForConfig(g.gatherProtoKubeConfig)
 	if err != nil {
-		return nil, []error{err}
+		ch <- gatherResult{nil, []error{err}}
+		return
 	}
 
 	client := gatherKubeClient.CoreV1()
 
 	records, err := gatherOpenShiftAPIServerOperatorLastDayLogs(g.ctx, client, messagesToSearch)
 	if err != nil {
-		return nil, []error{err}
+		ch <- gatherResult{nil, []error{err}}
+		return
 	}
 
-	return records, nil
+	ch <- gatherResult{records, nil}
 }
 
 func gatherOpenShiftAPIServerOperatorLastDayLogs(