Skip to content

Commit b7d5a98

Browse files
DexterYanDexterYan
authored
feat(collector): add helm collector (#1309)
1 parent 96c482a commit b7d5a98

18 files changed

+714
-19
lines changed

‎config/crds/troubleshoot.sh_collectors.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,17 @@ spec:
318318
- namespace
319319
- selector
320320
type: object
321+
helm:
322+
properties:
323+
collectorName:
324+
type: string
325+
exclude:
326+
type: BoolString
327+
namespace:
328+
type: string
329+
releaseName:
330+
type: string
331+
type: object
321332
http:
322333
properties:
323334
collectorName:

‎config/crds/troubleshoot.sh_preflights.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,6 +1815,17 @@ spec:
18151815
- namespace
18161816
- selector
18171817
type: object
1818+
helm:
1819+
properties:
1820+
collectorName:
1821+
type: string
1822+
exclude:
1823+
type: BoolString
1824+
namespace:
1825+
type: string
1826+
releaseName:
1827+
type: string
1828+
type: object
18181829
http:
18191830
properties:
18201831
collectorName:

‎config/crds/troubleshoot.sh_supportbundles.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1846,6 +1846,17 @@ spec:
18461846
- namespace
18471847
- selector
18481848
type: object
1849+
helm:
1850+
properties:
1851+
collectorName:
1852+
type: string
1853+
exclude:
1854+
type: BoolString
1855+
namespace:
1856+
type: string
1857+
releaseName:
1858+
type: string
1859+
type: object
18491860
http:
18501861
properties:
18511862
collectorName:

‎go.mod‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ require (
4040
golang.org/x/sync v0.3.0
4141
gopkg.in/yaml.v2 v2.4.0
4242
k8s.io/api v0.27.4
43-
k8s.io/apiextensions-apiserver v0.27.2
43+
k8s.io/apiextensions-apiserver v0.27.3
4444
k8s.io/apimachinery v0.27.4
4545
k8s.io/apiserver v0.27.4
4646
k8s.io/cli-runtime v0.27.4
@@ -53,26 +53,48 @@ require (
5353
require (
5454
cloud.google.com/go/compute/metadata v0.2.3 // indirect
5555
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
56+
github.com/MakeNowJust/heredoc v1.0.0 // indirect
57+
github.com/Masterminds/goutils v1.1.1 // indirect
58+
github.com/Masterminds/semver/v3 v3.2.1 // indirect
59+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
60+
github.com/Masterminds/squirrel v1.5.4 // indirect
61+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
62+
github.com/chai2010/gettext-go v1.0.2 // indirect
5663
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
5764
github.com/docker/distribution v2.8.2+incompatible // indirect
5865
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
5966
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
67+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
68+
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
6069
github.com/go-logr/stdr v1.2.2 // indirect
6170
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
6271
github.com/golang-sql/sqlexp v0.1.0 // indirect
6372
github.com/google/s2a-go v0.1.3 // indirect
6473
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
74+
github.com/gosuri/uitable v0.0.4 // indirect
75+
github.com/huandu/xstrings v1.4.0 // indirect
6576
github.com/jackc/pgpassfile v1.0.0 // indirect
6677
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
78+
github.com/jmoiron/sqlx v1.3.5 // indirect
79+
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
80+
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
81+
github.com/lib/pq v1.10.9 // indirect
6782
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
6883
github.com/mistifyio/go-zfs/v3 v3.0.0 // indirect
84+
github.com/mitchellh/copystructure v1.2.0 // indirect
85+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6986
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
87+
github.com/rubenv/sql-migrate v1.3.1 // indirect
7088
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7189
github.com/shoenig/go-m1cpu v0.1.6 // indirect
90+
github.com/shopspring/decimal v1.3.1 // indirect
7291
github.com/sirupsen/logrus v1.9.3 // indirect
7392
github.com/sylabs/sif/v2 v2.11.1 // indirect
7493
github.com/tchap/go-patricia/v2 v2.3.1 // indirect
7594
github.com/vladimirvivien/gexe v0.2.0 // indirect
95+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
96+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
97+
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
7698
go.opentelemetry.io/otel/metric v1.16.0 // indirect
7799
go.opentelemetry.io/otel/trace v1.16.0 // indirect
78100
go.uber.org/atomic v1.10.0 // indirect
@@ -81,6 +103,8 @@ require (
81103
golang.org/x/mod v0.10.0 // indirect
82104
golang.org/x/tools v0.9.1 // indirect
83105
sigs.k8s.io/e2e-framework v0.2.0 // indirect
106+
k8s.io/component-base v0.27.4 // indirect
107+
k8s.io/kubectl v0.27.3 // indirect
84108
)
85109

86110
require (
@@ -196,11 +220,11 @@ require (
196220
github.com/yusufpapurcu/wmi v1.2.3 // indirect
197221
go.opencensus.io v0.24.0 // indirect
198222
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
199-
golang.org/x/crypto v0.9.0 // indirect
223+
golang.org/x/crypto v0.11.0 // indirect
200224
golang.org/x/net v0.10.0 // indirect
201225
golang.org/x/oauth2 v0.7.0 // indirect
202226
golang.org/x/sys v0.10.0 // indirect
203-
golang.org/x/term v0.8.0 // indirect
227+
golang.org/x/term v0.10.0 // indirect
204228
golang.org/x/text v0.12.0
205229
golang.org/x/time v0.3.0 // indirect
206230
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
@@ -212,6 +236,7 @@ require (
212236
gopkg.in/inf.v0 v0.9.1 // indirect
213237
gopkg.in/ini.v1 v1.67.0 // indirect
214238
gopkg.in/yaml.v3 v3.0.1 // indirect
239+
helm.sh/helm/v3 v3.12.3
215240
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
216241
k8s.io/metrics v0.27.4
217242
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2

0 commit comments

Comments
 (0)