From 8fc4a3d8db8e958d6d3b8a7678fa29081e09d510 Mon Sep 17 00:00:00 2001 From: divolgin Date: Fri, 29 Oct 2021 19:03:38 +0000 Subject: [PATCH] Don't fail weave report if no files collected --- go.mod | 2 +- go.sum | 4 ++-- pkg/supportbundle/defaultspec/spec.yaml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 20dd76e886..6c4b33e6da 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/pquerna/cachecontrol v0.0.0-20180517163645-1555304b9b35 // indirect github.com/rancher/wrangler v0.8.3 github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244 - github.com/replicatedhq/troubleshoot v0.21.0 + github.com/replicatedhq/troubleshoot v0.22.0 github.com/replicatedhq/yaml/v3 v3.0.0-beta5-replicatedhq github.com/robfig/cron v1.2.0 github.com/robfig/cron/v3 v3.0.1 diff --git a/go.sum b/go.sum index f09f9e4c7f..fd49b4aec2 100644 --- a/go.sum +++ b/go.sum @@ -1632,8 +1632,8 @@ github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244 h1:aSORttMXeqRXg github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244/go.mod h1:SoROyLOtkt95R1COPVzdCi5FZbMmATPHohQQzW9V9ds= github.com/replicatedhq/termui/v3 v3.1.1-0.20200811145416-f40076d26851/go.mod h1:JDxG6+uubnk9/BZ2yUsyAJJwlptjrnmB2MPF5d2Xe/8= github.com/replicatedhq/troubleshoot v0.10.18/go.mod h1:8oFRnMJlFjzJ490eq72iLEN7DGJjkgLx22Z1vX6WwU0= -github.com/replicatedhq/troubleshoot v0.21.0 h1:8MvHtF3BB5KIFyHvU/caVX7rZSVCN4eeyGY/evO398A= -github.com/replicatedhq/troubleshoot v0.21.0/go.mod h1:aWhykK6xiTpfbLMjPpqnonih34avLwEag52Y9CYzb/Y= +github.com/replicatedhq/troubleshoot v0.22.0 h1:eve5I1dYZJWZs31bS07mE/UY/iL5ukRgEyPWPd3aV9M= +github.com/replicatedhq/troubleshoot v0.22.0/go.mod h1:aWhykK6xiTpfbLMjPpqnonih34avLwEag52Y9CYzb/Y= github.com/replicatedhq/yaml/v3 v3.0.0-beta5-replicatedhq h1:PwPggruelq2336c1Ayg5STFqgbn/QB1tWLQwrVlU7ZQ= github.com/replicatedhq/yaml/v3 v3.0.0-beta5-replicatedhq/go.mod h1:Txa7LopbYCU8aRgmNe0n+y/EPMz50NbCPcVVJBquwag= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= diff --git a/pkg/supportbundle/defaultspec/spec.yaml b/pkg/supportbundle/defaultspec/spec.yaml index 490d768fd4..d6e757f61f 100644 --- a/pkg/supportbundle/defaultspec/spec.yaml +++ b/pkg/supportbundle/defaultspec/spec.yaml @@ -237,6 +237,7 @@ spec: - textAnalyze: checkName: Weave Status exclude: "" + ignoreIfNoFiles: true fileName: kots/kurl/weave/kube-system/weave-net-*/weave-status-stdout.txt outcomes: - fail: @@ -247,6 +248,7 @@ spec: - textAnalyze: checkName: Weave Report exclude: "" + ignoreIfNoFiles: true fileName: kots/kurl/weave/kube-system/weave-net-*/weave-report-stdout.txt outcomes: - fail: @@ -257,6 +259,7 @@ spec: - textAnalyze: checkName: Inter-pod Networking exclude: "" + ignoreIfNoFiles: true fileName: kots/goldpinger/*/kotsadm-*/goldpinger-statistics-stdout.txt outcomes: - fail: