github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-04-15 07:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Running collectors without the CRD

Browse Source
This commit is contained in:
Marc Campbell
2019-07-18 02:01:30 +00:00
parent e3b1a9a1d5
commit df4edcb80d
25 changed files with 845 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/collectorjob/collectorjob_controller.go
View File

@@ -434,6 +434,8 @@ func idForCollector(collector *troubleshootv1beta1.Collect) string {
return "cluster-info"
} else if collector.ClusterResources != nil {
return "cluster-resources"
} else if collector.Secret != nil {
return fmt.Sprintf("secret-%s%s", collector.Secret.Namespace, collector.Secret.Name)
}
return ""

7
pkg/controller/preflightjob/collectors.go
View File

@@ -2,9 +2,10 @@ package preflightjob
import (
"context"
"fmt"
troubleshootv1beta1 "github.com/replicatedhq/troubleshoot/pkg/apis/troubleshoot/v1beta1"
"github.com/replicatedhq/troubleshoot/pkg/preflight"
collectrunner "github.com/replicatedhq/troubleshoot/pkg/collect"
)
func (r *ReconcilePreflightJob) reconcilePreflightCollectors(instance *troubleshootv1beta1.PreflightJob, preflight *troubleshootv1beta1.Preflight) error {
@@ -57,7 +58,7 @@ func (r *ReconcilePreflightJob) reconcileOnePreflightCollector(instance *trouble
return nil
}
_, _, err := preflight.CreateCollector(r.Client, r.scheme, instance, instance.Name, instance.Namespace, collect, instance.Spec.Image, instance.Spec.ImagePullPolicy)
_, _, err := collectrunner.CreateCollector(r.Client, r.scheme, instance, instance.Name, instance.Namespace, "preflight", collect, instance.Spec.Image, instance.Spec.ImagePullPolicy)
if err != nil {
return err
}
@@ -94,6 +95,8 @@ func idForCollector(collector *troubleshootv1beta1.Collect) string {
return "cluster-info"
} else if collector.ClusterResources != nil {
return "cluster-resources"
} else if collector.Secret != nil {
return fmt.Sprintf("secret-%s%s", collector.Secret.Namespace, collector.Secret.Name)
}
return ""