Skip to content

Commit b2e0064

Browse files
author
Massimiliano Donini
committed
Merge remote-tracking branch 'upstream/main' into ilmax/add-helm-extra-set-flag
2 parents 2201116 + 9eeb997 commit b2e0064

File tree

6 files changed

+80
-59
lines changed

6 files changed

+80
-59
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ If you have a chart in current directory and ct installed on the host then you c
9393

9494
With docker it works with:
9595

96-
docker run -it --workdir=/data --volume ~/.kube/config:/root/.kube/config:ro --volume $(pwd):/data quay.io/helmpack/chart-testing:v3.5.0 ct install --chart-dirs . --charts .
96+
docker run -it --network host --workdir=/data --volume ~/.kube/config:/root/.kube/config:ro --volume $(pwd):/data quay.io/helmpack/chart-testing:v3.5.0 ct install --chart-dirs . --charts .
9797

9898
Notice that `workdir` param is important and must be the same as volume mounted.
9999

‎ct/cmd/install.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func addInstallFlags(flags *flag.FlagSet) {
6363
the ID of a pull request. If not specified, the name of the chart is used`))
6464
flags.String("helm-extra-args", "", heredoc.Doc(`
6565
Additional arguments for Helm. Must be passed as a single quoted string
66-
(e.g. "--timeout 500"`))
66+
(e.g. "--timeout 500s"`))
6767
flags.Bool("upgrade", false, heredoc.Doc(`
6868
Whether to test an in-place upgrade of each chart from its previous revision if the
6969
current version should not introduce a breaking change according to the SemVer spec`))

‎doc/ct_install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ ct install [flags]
4949
--excluded-charts strings Charts that should be skipped. May be specified multiple times
5050
or separate values with commas
5151
--helm-extra-args string Additional arguments for Helm. Must be passed as a single quoted string
52-
(e.g. "--timeout 500")
52+
(e.g. "--timeout 500s")
5353
--helm-extra-set-args string Additional arguments for Helm. Must be passed as a single quoted string
5454
(e.g. "--set=name=value")
5555
--helm-repo-extra-args strings Additional arguments for the 'helm repo add' command to be

‎doc/ct_lint-and-install.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ct lint-and-install [flags]
4141
--excluded-charts strings Charts that should be skipped. May be specified multiple times
4242
or separate values with commas
4343
--helm-extra-args string Additional arguments for Helm. Must be passed as a single quoted string
44-
(e.g. "--timeout 500")
44+
(e.g. "--timeout 500s")
4545
--helm-extra-set-args string Additional arguments for Helm. Must be passed as a single quoted string
4646
(e.g. "--set=name=value")
4747
--helm-repo-extra-args strings Additional arguments for the 'helm repo add' command to be

‎go.mod

+22-17
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/MakeNowJust/heredoc v1.0.0
77
github.com/Masterminds/semver v1.5.0
88
github.com/anchore/syft v0.34.0
9-
github.com/goreleaser/goreleaser v1.2.5
9+
github.com/goreleaser/goreleaser v1.6.1
1010
github.com/hashicorp/go-multierror v1.1.1
1111
github.com/hashicorp/go-retryablehttp v0.7.0
1212
github.com/mattn/go-shellwords v1.0.12
@@ -16,15 +16,15 @@ require (
1616
github.com/spf13/pflag v1.0.5
1717
github.com/spf13/viper v1.10.1
1818
github.com/stretchr/testify v1.7.0
19-
golang.org/x/tools v0.1.8
19+
golang.org/x/tools v0.1.9
2020
gopkg.in/yaml.v2 v2.4.0
2121
)
2222

2323
require (
2424
cloud.google.com/go v0.99.0 // indirect
2525
cloud.google.com/go/kms v1.1.0 // indirect
2626
cloud.google.com/go/storage v1.18.2 // indirect
27-
code.gitea.io/sdk/gitea v0.15.0 // indirect
27+
code.gitea.io/sdk/gitea v0.15.1 // indirect
2828
github.com/AlekSi/pointer v1.2.0 // indirect
2929
github.com/Azure/azure-pipeline-go v0.2.3 // indirect
3030
github.com/Azure/azure-sdk-for-go v60.2.0+incompatible // indirect
@@ -60,7 +60,7 @@ require (
6060
github.com/andybalholm/brotli v1.0.4 // indirect
6161
github.com/antihax/optional v1.0.0 // indirect
6262
github.com/apex/log v1.9.0 // indirect
63-
github.com/atc0005/go-teams-notify/v2 v2.6.0 // indirect
63+
github.com/atc0005/go-teams-notify/v2 v2.6.1 // indirect
6464
github.com/aws/aws-sdk-go v1.42.24 // indirect
6565
github.com/aws/aws-sdk-go-v2 v1.11.2 // indirect
6666
github.com/aws/aws-sdk-go-v2/config v1.11.0 // indirect
@@ -78,7 +78,8 @@ require (
7878
github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect
7979
github.com/bmatcuk/doublestar/v4 v4.0.2 // indirect
8080
github.com/caarlos0/ctrlc v1.0.0 // indirect
81-
github.com/caarlos0/env/v6 v6.8.0 // indirect
81+
github.com/caarlos0/env/v6 v6.9.1 // indirect
82+
github.com/caarlos0/go-reddit/v3 v3.0.1 // indirect
8283
github.com/caarlos0/go-shellwords v1.0.12 // indirect
8384
github.com/cavaliergopher/cpio v1.0.1 // indirect
8485
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
@@ -91,7 +92,7 @@ require (
9192
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
9293
github.com/davecgh/go-spew v1.1.1 // indirect
9394
github.com/dghubble/go-twitter v0.0.0-20211115160449-93a8679adecb // indirect
94-
github.com/dghubble/oauth1 v0.7.0 // indirect
95+
github.com/dghubble/oauth1 v0.7.1 // indirect
9596
github.com/dghubble/sling v1.4.0 // indirect
9697
github.com/dimchansky/utfbom v1.1.1 // indirect
9798
github.com/docker/cli v20.10.10+incompatible // indirect
@@ -120,18 +121,18 @@ require (
120121
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
121122
github.com/golang/protobuf v1.5.2 // indirect
122123
github.com/golang/snappy v0.0.3 // indirect
123-
github.com/google/go-cmp v0.5.6 // indirect
124+
github.com/google/go-cmp v0.5.7 // indirect
124125
github.com/google/go-containerregistry v0.7.0 // indirect
125-
github.com/google/go-github/v39 v39.2.0 // indirect
126+
github.com/google/go-github/v43 v43.0.0 // indirect
126127
github.com/google/go-querystring v1.1.0 // indirect
127128
github.com/google/rpmpack v0.0.0-20211125064518-d0ed9b1b61b9 // indirect
128129
github.com/google/uuid v1.3.0 // indirect
129130
github.com/google/wire v0.5.0 // indirect
130131
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
131132
github.com/gookit/color v1.2.7 // indirect
132133
github.com/goreleaser/chglog v0.1.2 // indirect
133-
github.com/goreleaser/fileglob v1.2.0 // indirect
134-
github.com/goreleaser/nfpm/v2 v2.11.3 // indirect
134+
github.com/goreleaser/fileglob v1.3.0 // indirect
135+
github.com/goreleaser/nfpm/v2 v2.14.0 // indirect
135136
github.com/gorilla/websocket v1.4.2 // indirect
136137
github.com/hashicorp/errwrap v1.0.0 // indirect
137138
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -158,6 +159,11 @@ require (
158159
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
159160
github.com/mitchellh/mapstructure v1.4.3 // indirect
160161
github.com/mitchellh/reflectwalk v1.0.2 // indirect
162+
github.com/muesli/coral v1.0.0 // indirect
163+
github.com/muesli/mango v0.1.0 // indirect
164+
github.com/muesli/mango-coral v1.0.1 // indirect
165+
github.com/muesli/mango-pflag v0.1.0 // indirect
166+
github.com/muesli/roff v0.1.0 // indirect
161167
github.com/nwaples/rardecode v1.1.0 // indirect
162168
github.com/olekukonko/tablewriter v0.0.4 // indirect
163169
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -170,7 +176,7 @@ require (
170176
github.com/scylladb/go-set v1.0.2 // indirect
171177
github.com/sergi/go-diff v1.2.0 // indirect
172178
github.com/sirupsen/logrus v1.8.1 // indirect
173-
github.com/slack-go/slack v0.10.0 // indirect
179+
github.com/slack-go/slack v0.10.2 // indirect
174180
github.com/spdx/tools-golang v0.1.0 // indirect
175181
github.com/spf13/afero v1.6.0 // indirect
176182
github.com/spf13/cast v1.4.1 // indirect
@@ -179,25 +185,24 @@ require (
179185
github.com/subosito/gotenv v1.2.0 // indirect
180186
github.com/technoweenie/multipartstreamer v1.0.1 // indirect
181187
github.com/ulikunitz/xz v0.5.10 // indirect
182-
github.com/vartanbeno/go-reddit/v2 v2.0.1 // indirect
183188
github.com/vbatts/tar-split v0.11.2 // indirect
184189
github.com/vifraa/gopom v0.1.0 // indirect
185190
github.com/wagoodman/go-partybus v0.0.0-20210627031916-db1f5573bbc5 // indirect
186191
github.com/wagoodman/go-progress v0.0.0-20200731105512-1020f39e6240 // indirect
187192
github.com/wagoodman/jotframe v0.0.0-20211129225309-56b0d0a4aebb // indirect
188193
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
189-
github.com/xanzy/go-gitlab v0.52.2 // indirect
194+
github.com/xanzy/go-gitlab v0.56.0 // indirect
190195
github.com/xanzy/ssh-agent v0.3.1 // indirect
191196
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
192197
go.opencensus.io v0.23.0 // indirect
193198
gocloud.dev v0.24.0 // indirect
194-
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
199+
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 // indirect
195200
golang.org/x/mod v0.5.1 // indirect
196-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
201+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
197202
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
198203
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
199-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
200-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
204+
golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a // indirect
205+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
201206
golang.org/x/text v0.3.7 // indirect
202207
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
203208
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect

0 commit comments

Comments
 (0)