Kwsorensen/troubleshoot 13.6 (#2003)

Update to troubleshoot v0.13.6 and include kurl ConfigMap's in support bundle
replicatedhq · Jul 27, 2021 · c849aff · c849aff
1 parent 3e7f416
commit c849aff
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -61,7 +61,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/replicatedhq/kurl v0.0.0-20210414162418-8d6211901244
-	github.com/replicatedhq/troubleshoot v0.13.5
+	github.com/replicatedhq/troubleshoot v0.13.6
 	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
@@ -1250,6 +1250,8 @@ github.com/replicatedhq/termui/v3 v3.1.1-0.20200811145416-f40076d26851/go.mod h1
 github.com/replicatedhq/troubleshoot v0.10.18/go.mod h1:8oFRnMJlFjzJ490eq72iLEN7DGJjkgLx22Z1vX6WwU0=
 github.com/replicatedhq/troubleshoot v0.13.5 h1:/WSW0oMcknoJyvwssnAw5zMap05eeWY2AJMPXfIsYgQ=
 github.com/replicatedhq/troubleshoot v0.13.5/go.mod h1:mfDCXqnMY1OUoELXFIZnNH7zHYIveAfuv5eZFcHZnVk=
+github.com/replicatedhq/troubleshoot v0.13.6 h1:btbQEV/ZN2QopXCCNhsmY74qmOCpsyESiBQd5C80skU=
+github.com/replicatedhq/troubleshoot v0.13.6/go.mod h1:mfDCXqnMY1OUoELXFIZnNH7zHYIveAfuv5eZFcHZnVk=
 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/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=

diff --git a/pkg/supportbundle/spec.go b/pkg/supportbundle/spec.go
@@ -494,6 +494,28 @@ func makeKurlCollectors(image string, pullSecret *troubleshootv1beta2.ImagePullS
 		})
 	}
 
+	collectors = append(collectors, &troubleshootv1beta2.Collect{
+		ConfigMap: &troubleshootv1beta2.ConfigMap{
+			CollectorMeta: troubleshootv1beta2.CollectorMeta{
+				CollectorName: "kurl-current-config",
+			},
+			Name:           "kurl-current-config",
+			Namespace:      "kurl",
+			IncludeAllData: true,
+		},
+	})
+
+	collectors = append(collectors, &troubleshootv1beta2.Collect{
+		ConfigMap: &troubleshootv1beta2.ConfigMap{
+			CollectorMeta: troubleshootv1beta2.CollectorMeta{
+				CollectorName: "kurl-last-config",
+			},
+			Name:           "kurl-last-config",
+			Namespace:      "kurl",
+			IncludeAllData: true,
+		},
+	})
+
 	return collectors
 }