github/troubleshoot
1
0
Fork 0
mirror of https://github.com/replicatedhq/troubleshoot.git synced 2026-02-14 18:29:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(support-bundle): add runHostCollectorsInPod in spec (#1608)

Browse Source
This commit is contained in:
Dexter Yan
2024-09-20 11:57:58 -05:00
committed by GitHub
parent 8823f7d99e
commit e97b9613a5
48 changed files with 447 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/troubleshoot/cli/run.go
View File

@@ -9,6 +9,7 @@ import (
"os"
"os/signal"
"path/filepath"
"reflect"
"sync"
"time"
@@ -183,6 +184,7 @@ func runTroubleshoot(v *viper.Viper, args []string) error {
OutputPath: v.GetString("output"),
Redact: v.GetBool("redact"),
FromCLI: true,
RunHostCollectorsInPod: mainBundle.Metadata.RunHostCollectorsInPod,
}
nonInteractiveOutput := analysisOutput{}
@@ -197,7 +199,7 @@ func runTroubleshoot(v *viper.Viper, args []string) error {
if len(response.AnalyzerResults) > 0 {
if interactive {
if err := showInteractiveResults(mainBundle.Name, response.AnalyzerResults, response.ArchivePath); err != nil {
if err := showInteractiveResults(mainBundle.Metadata.Name, response.AnalyzerResults, response.ArchivePath); err != nil {
interactive = false
}
} else {
@@ -206,7 +208,7 @@ func runTroubleshoot(v *viper.Viper, args []string) error {
}
if !response.FileUploaded {
if appName := mainBundle.Labels["applicationName"]; appName != "" {
if appName := mainBundle.Metadata.Labels["applicationName"]; appName != "" {
f := `A support bundle for %s has been created in this directory
named %s. Please upload it on the Troubleshoot page of
the %s Admin Console to begin analysis.`
@@ -335,14 +337,25 @@ func loadSpecs(ctx context.Context, args []string, client kubernetes.Interface)
APIVersion: "troubleshoot.sh/v1beta2",
Kind: "SupportBundle",
},
ObjectMeta: metav1.ObjectMeta{
Name: "merged-support-bundle-spec",
Metadata: troubleshootv1beta2.SupportBundleMetadata{
ObjectMeta: metav1.ObjectMeta{
Name: "merged-support-bundle-spec",
},
RunHostCollectorsInPod: false,
},
}
var enableRunHostCollectorsInPod bool
for _, sb := range kinds.SupportBundlesV1Beta2 {
sb := sb
mainBundle = supportbundle.ConcatSpec(mainBundle, &sb)
//check if sb has metadata and if it has RunHostCollectorsInPod set to true
if !reflect.DeepEqual(sb.Metadata.ObjectMeta, metav1.ObjectMeta{}) && sb.Metadata.RunHostCollectorsInPod {
enableRunHostCollectorsInPod = sb.Metadata.RunHostCollectorsInPod
}
}
mainBundle.Metadata.RunHostCollectorsInPod = enableRunHostCollectorsInPod
for _, c := range kinds.CollectorsV1Beta2 {
mainBundle.Spec.Collectors = util.Append(mainBundle.Spec.Collectors, c.Spec.Collectors)