Bug 2002539: Fix wrong rebase of PSP gatherer (#512)

openshift · Sep 24, 2021 · 4fdf365 · 4fdf365
1 parent acf24a5
commit 4fdf365
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/gather/clusterconfig/0_gatherer.go b/pkg/gather/clusterconfig/0_gatherer.go
@@ -115,6 +115,7 @@ var gatherFunctions = map[string]gathering{
 	"sap_pods":                          failable(GatherSAPPods),
 	"sap_datahubs":                      failable(GatherSAPDatahubs),
 	"olm_operators":                     failable(GatherOLMOperators),
+	"psps":                              failable(GatherPodSecurityPolicies),
 }
 
 var startTime time.Time

diff --git a/pkg/gather/clusterconfig/pod_security_policies.go b/pkg/gather/clusterconfig/pod_security_policies.go
@@ -17,13 +17,13 @@ import (
 // * Id in config: psps
 // * Since versions:
 //   * 4.10+
-func (g *Gatherer) GatherPodSecurityPolicies(ctx context.Context) ([]record.Record, []error) {
+func GatherPodSecurityPolicies(g *Gatherer, c chan<- gatherResult) {
 	gatherPolicyClient, err := policyclient.NewForConfig(g.gatherKubeConfig)
 	if err != nil {
-		return nil, []error{err}
+		c <- gatherResult{errors: []error{err}}
 	}
-
-	return gatherPodSecurityPolicies(ctx, gatherPolicyClient)
+	records, errs := gatherPodSecurityPolicies(g.ctx, gatherPolicyClient)
+	c <- gatherResult{records: records, errors: errs}
 }
 
 func gatherPodSecurityPolicies(ctx context.Context, policyClient policyclient.PolicyV1beta1Interface) ([]record.Record, []error) {