Skip to content

Commit f5eca69

Browse files
tmshorttmshort
committed
Helm upgrade to v3.11.1 for CVE-2023-25165 (#2933)
* Update Helm to v3.11.1 Updatate go.mod, go.sum, and vendor directory. Signed-off-by: Todd Short <[email protected]> * Run go fmt Plus some manual edits. Signed-off-by: Todd Short <[email protected]> * Update from make verify Signed-off-by: Todd Short <[email protected]> * Fix golangci-lint issues Signed-off-by: Todd Short <[email protected]> * Client updates due to controller-runtime Status is now updated using SubResource methods and options Signed-off-by: Todd Short <[email protected]> --------- Signed-off-by: Todd Short <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: b54296a21f388a40eab7c1278e43b2eb866d95ee
1 parent 9712321 commit f5eca69

File tree

236 files changed

+17804
-6435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+17804
-6435
lines changed

‎go.mod

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,32 +16,32 @@ require (
1616
github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
1818
github.com/operator-framework/operator-registry v1.17.5
19-
github.com/sirupsen/logrus v1.8.1
20-
github.com/spf13/cobra v1.6.0
21-
github.com/stretchr/testify v1.8.0
19+
github.com/sirupsen/logrus v1.9.0
20+
github.com/spf13/cobra v1.6.1
21+
github.com/stretchr/testify v1.8.2
2222
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
2323
google.golang.org/protobuf v1.28.1
2424
gopkg.in/yaml.v2 v2.4.0
25-
helm.sh/helm/v3 v3.10.3
25+
helm.sh/helm/v3 v3.11.1
2626
k8s.io/api v0.26.1
2727
k8s.io/apimachinery v0.26.1
2828
k8s.io/client-go v0.26.1
2929
k8s.io/code-generator v0.26.1
3030
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
3131
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
32-
sigs.k8s.io/controller-runtime v0.14.4
32+
sigs.k8s.io/controller-runtime v0.14.5
3333
sigs.k8s.io/controller-tools v0.8.0
3434
)
3535

3636
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
3737

3838
require (
3939
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
40-
github.com/BurntSushi/toml v1.1.0 // indirect
40+
github.com/BurntSushi/toml v1.2.1 // indirect
4141
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4242
github.com/Masterminds/goutils v1.1.1 // indirect
43-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
44-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
43+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
44+
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4545
github.com/Masterminds/squirrel v1.5.3 // indirect
4646
github.com/Masterminds/vcs v1.13.3 // indirect
4747
github.com/Microsoft/go-winio v0.5.2 // indirect
@@ -51,7 +51,7 @@ require (
5151
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
5252
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
5353
github.com/beorn7/perks v1.0.1 // indirect
54-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
54+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
5555
github.com/cespare/xxhash/v2 v2.1.2 // indirect
5656
github.com/chai2010/gettext-go v1.0.2 // indirect
5757
github.com/containerd/cgroups v1.0.4 // indirect
@@ -64,10 +64,10 @@ require (
6464
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
6565
github.com/davecgh/go-spew v1.1.1 // indirect
6666
github.com/distribution/distribution v2.7.1+incompatible // indirect
67-
github.com/docker/cli v20.10.17+incompatible // indirect
67+
github.com/docker/cli v20.10.21+incompatible // indirect
6868
github.com/docker/distribution v2.8.1+incompatible // indirect
69-
github.com/docker/docker v20.10.17+incompatible // indirect
70-
github.com/docker/docker-credential-helpers v0.6.4 // indirect
69+
github.com/docker/docker v20.10.21+incompatible // indirect
70+
github.com/docker/docker-credential-helpers v0.7.0 // indirect
7171
github.com/docker/go-connections v0.4.0 // indirect
7272
github.com/docker/go-metrics v0.0.1 // indirect
7373
github.com/docker/go-units v0.4.0 // indirect
@@ -78,6 +78,7 @@ require (
7878
github.com/fatih/color v1.13.0 // indirect
7979
github.com/felixge/httpsnoop v1.0.3 // indirect
8080
github.com/fsnotify/fsnotify v1.6.0 // indirect
81+
github.com/fvbommel/sortorder v1.0.1 // indirect
8182
github.com/ghodss/yaml v1.0.0 // indirect
8283
github.com/go-air/gini v1.0.4 // indirect
8384
github.com/go-errors/errors v1.0.1 // indirect
@@ -106,15 +107,15 @@ require (
106107
github.com/google/gofuzz v1.2.0 // indirect
107108
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
108109
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
109-
github.com/google/uuid v1.2.0 // indirect
110+
github.com/google/uuid v1.3.0 // indirect
110111
github.com/gorilla/mux v1.8.0 // indirect
111112
github.com/gosuri/uitable v0.0.4 // indirect
112113
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
113114
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
114115
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
115116
github.com/h2non/filetype v1.1.1 // indirect
116117
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
117-
github.com/huandu/xstrings v1.3.2 // indirect
118+
github.com/huandu/xstrings v1.3.3 // indirect
118119
github.com/imdario/mergo v0.3.12 // indirect
119120
github.com/inconshreveable/mousetrap v1.0.1 // indirect
120121
github.com/itchyny/astgen-go v0.0.0-20200519013840-cf3ea398f645 // indirect
@@ -130,13 +131,13 @@ require (
130131
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
131132
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
132133
github.com/lestrrat-go/strftime v1.0.1 // indirect
133-
github.com/lib/pq v1.10.6 // indirect
134+
github.com/lib/pq v1.10.7 // indirect
134135
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
135136
github.com/mailru/easyjson v0.7.6 // indirect
136137
github.com/mattn/go-colorable v0.1.12 // indirect
137138
github.com/mattn/go-isatty v0.0.14 // indirect
138139
github.com/mattn/go-runewidth v0.0.9 // indirect
139-
github.com/mattn/go-sqlite3 v1.14.10 // indirect
140+
github.com/mattn/go-sqlite3 v1.14.14 // indirect
140141
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
141142
github.com/mitchellh/copystructure v1.2.0 // indirect
142143
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
@@ -146,15 +147,15 @@ require (
146147
github.com/moby/locker v1.0.1 // indirect
147148
github.com/moby/spdystream v0.2.0 // indirect
148149
github.com/moby/sys/mountinfo v0.5.0 // indirect
149-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
150+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
150151
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
151152
github.com/modern-go/reflect2 v1.0.2 // indirect
152153
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
153154
github.com/morikuni/aec v1.0.0 // indirect
154155
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
155156
github.com/onsi/gomega v1.24.1 // indirect
156157
github.com/opencontainers/go-digest v1.0.0 // indirect
157-
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
158+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
158159
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
159160
github.com/otiai10/copy v1.2.0 // indirect
160161
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
@@ -165,7 +166,7 @@ require (
165166
github.com/prometheus/client_model v0.3.0 // indirect
166167
github.com/prometheus/common v0.37.0 // indirect
167168
github.com/prometheus/procfs v0.8.0 // indirect
168-
github.com/rubenv/sql-migrate v1.1.2 // indirect
169+
github.com/rubenv/sql-migrate v1.2.0 // indirect
169170
github.com/russross/blackfriday/v2 v2.1.0 // indirect
170171
github.com/shopspring/decimal v1.2.0 // indirect
171172
github.com/spf13/cast v1.4.1 // indirect
@@ -184,34 +185,34 @@ require (
184185
go.opencensus.io v0.23.0 // indirect
185186
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
186187
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.0 // indirect
187-
go.opentelemetry.io/otel v1.10.0 // indirect
188-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
189-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
190-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
188+
go.opentelemetry.io/otel v1.12.0 // indirect
189+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.12.0 // indirect
190+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.12.0 // indirect
191+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.12.0 // indirect
191192
go.opentelemetry.io/otel/metric v0.31.0 // indirect
192-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
193-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
193+
go.opentelemetry.io/otel/sdk v1.12.0 // indirect
194+
go.opentelemetry.io/otel/trace v1.12.0 // indirect
194195
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
195196
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
196197
go.uber.org/atomic v1.7.0 // indirect
197198
go.uber.org/multierr v1.6.0 // indirect
198199
go.uber.org/zap v1.24.0 // indirect
199-
golang.org/x/crypto v0.1.0 // indirect
200+
golang.org/x/crypto v0.5.0 // indirect
200201
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
201202
golang.org/x/mod v0.6.0 // indirect
202203
golang.org/x/net v0.7.0 // indirect
203-
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
204-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
204+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
205+
golang.org/x/sync v0.1.0 // indirect
205206
golang.org/x/sys v0.5.0 // indirect
206207
golang.org/x/term v0.5.0 // indirect
207208
golang.org/x/text v0.7.0 // indirect
208209
golang.org/x/time v0.3.0 // indirect
209210
golang.org/x/tools v0.2.0 // indirect
210-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
211+
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
211212
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
212213
google.golang.org/appengine v1.6.7 // indirect
213-
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
214-
google.golang.org/grpc v1.49.0 // indirect
214+
google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect
215+
google.golang.org/grpc v1.52.0 // indirect
215216
gopkg.in/inf.v0 v0.9.1 // indirect
216217
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
217218
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
@@ -228,7 +229,7 @@ require (
228229
k8s.io/kms v0.26.1 // indirect
229230
k8s.io/kube-aggregator v0.25.3 // indirect
230231
k8s.io/kubectl v0.26.1 // indirect
231-
oras.land/oras-go v1.2.0 // indirect
232+
oras.land/oras-go v1.2.2 // indirect
232233
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect
233234
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
234235
sigs.k8s.io/kustomize/api v0.12.1 // indirect

0 commit comments

Comments
 (0)