Skip to content

Commit 3701078

Browse files
joelanfordtmshort
joelanford
authored and
tmshort
committed
containerdregistry: support per-repo credentials (#1165)
* containerdregistry: support per-repo credentials Signed-off-by: Joe Lanford <[email protected]> * containerdregistry: honor REGISTRY_AUTH_FILE or DOCKER_CONFIG, if set Signed-off-by: Joe Lanford <[email protected]> --------- Signed-off-by: Joe Lanford <[email protected]> Upstream-repository: operator-registry Upstream-commit: 5e23ef594a41e6c8ce843d48b22715319c684dff
1 parent 2df4b00 commit 3701078

File tree

1,222 files changed

+106544
-23500
lines changed

Some content is hidden

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

1,222 files changed

+106544
-23500
lines changed

‎go.mod

Lines changed: 66 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@ go 1.19
55
require (
66
github.com/blang/semver/v4 v4.0.0
77
github.com/go-bindata/go-bindata/v3 v3.1.3
8-
github.com/go-logr/logr v1.2.4
8+
github.com/go-logr/logr v1.3.0
99
github.com/golang/mock v1.6.0
1010
github.com/googleapis/gnostic v0.5.5
1111
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
1212
github.com/maxbrunsfeld/counterfeiter/v6 v6.4.1
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
14-
github.com/onsi/ginkgo/v2 v2.9.5
14+
github.com/onsi/ginkgo/v2 v2.12.0
1515
github.com/openshift/api v3.9.0+incompatible
16-
github.com/operator-framework/api v0.19.0
16+
github.com/operator-framework/api v0.20.0
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
18-
github.com/operator-framework/operator-registry v1.32.0
19-
github.com/sirupsen/logrus v1.9.2
18+
github.com/operator-framework/operator-registry v1.33.0
19+
github.com/sirupsen/logrus v1.9.3
2020
github.com/spf13/cobra v1.7.0
21-
github.com/stretchr/testify v1.8.3
22-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
23-
google.golang.org/protobuf v1.30.0
21+
github.com/stretchr/testify v1.8.4
22+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
23+
google.golang.org/protobuf v1.31.0
2424
gopkg.in/yaml.v2 v2.4.0
2525
helm.sh/helm/v3 v3.12.2
2626
k8s.io/api v0.27.7
@@ -36,48 +36,52 @@ require (
3636
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
3737

3838
require (
39-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
39+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4040
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
41-
github.com/BurntSushi/toml v1.2.1 // indirect
41+
github.com/BurntSushi/toml v1.3.2 // indirect
4242
github.com/MakeNowJust/heredoc v1.0.0 // indirect
4343
github.com/Masterminds/goutils v1.1.1 // indirect
4444
github.com/Masterminds/semver/v3 v3.2.1 // indirect
4545
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4646
github.com/Masterminds/squirrel v1.5.4 // indirect
4747
github.com/Masterminds/vcs v1.13.3 // indirect
4848
github.com/Microsoft/go-winio v0.6.1 // indirect
49-
github.com/Microsoft/hcsshim v0.10.0-rc.7 // indirect
49+
github.com/Microsoft/hcsshim v0.12.0-rc.0 // indirect
5050
github.com/NYTimes/gziphandler v1.1.1 // indirect
51-
github.com/adrg/xdg v0.4.0 // indirect
5251
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
53-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
52+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5453
github.com/beorn7/perks v1.0.1 // indirect
55-
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
54+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5655
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5756
github.com/chai2010/gettext-go v1.0.2 // indirect
58-
github.com/containerd/cgroups v1.1.0 // indirect
59-
github.com/containerd/containerd v1.7.0 // indirect
60-
github.com/containerd/continuity v0.3.0 // indirect
61-
github.com/containerd/ttrpc v1.2.1 // indirect
62-
github.com/containerd/typeurl/v2 v2.1.0 // indirect
57+
github.com/containerd/cgroups/v3 v3.0.2 // indirect
58+
github.com/containerd/containerd v1.7.6 // indirect
59+
github.com/containerd/continuity v0.4.2 // indirect
60+
github.com/containerd/ttrpc v1.2.2 // indirect
61+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
62+
github.com/containers/common v0.56.0 // indirect
63+
github.com/containers/image/v5 v5.28.0 // indirect
64+
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
65+
github.com/containers/ocicrypt v1.1.8 // indirect
66+
github.com/containers/storage v1.50.2 // indirect
6367
github.com/coreos/go-semver v0.3.0 // indirect
6468
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6569
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
6670
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6771
github.com/davecgh/go-spew v1.1.1 // indirect
6872
github.com/distribution/distribution v2.7.1+incompatible // indirect
69-
github.com/docker/cli v23.0.1+incompatible // indirect
73+
github.com/docker/cli v24.0.6+incompatible // indirect
7074
github.com/docker/distribution v2.8.2+incompatible // indirect
71-
github.com/docker/docker v23.0.3+incompatible // indirect
72-
github.com/docker/docker-credential-helpers v0.7.0 // indirect
75+
github.com/docker/docker v24.0.6+incompatible // indirect
76+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
7377
github.com/docker/go-connections v0.4.0 // indirect
7478
github.com/docker/go-metrics v0.0.1 // indirect
7579
github.com/docker/go-units v0.5.0 // indirect
7680
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
7781
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7882
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
7983
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
80-
github.com/fatih/color v1.13.0 // indirect
84+
github.com/fatih/color v1.15.0 // indirect
8185
github.com/felixge/httpsnoop v1.0.3 // indirect
8286
github.com/fsnotify/fsnotify v1.6.0 // indirect
8387
github.com/fvbommel/sortorder v1.0.1 // indirect
@@ -91,8 +95,8 @@ require (
9195
github.com/go-logr/stdr v1.2.2 // indirect
9296
github.com/go-logr/zapr v1.2.4 // indirect
9397
github.com/go-openapi/jsonpointer v0.19.6 // indirect
94-
github.com/go-openapi/jsonreference v0.20.1 // indirect
95-
github.com/go-openapi/swag v0.22.3 // indirect
98+
github.com/go-openapi/jsonreference v0.20.2 // indirect
99+
github.com/go-openapi/swag v0.22.4 // indirect
96100
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
97101
github.com/gobuffalo/flect v0.2.3 // indirect
98102
github.com/gobwas/glob v0.2.3 // indirect
@@ -105,16 +109,16 @@ require (
105109
github.com/google/btree v1.0.1 // indirect
106110
github.com/google/cel-go v0.15.3 // indirect
107111
github.com/google/gnostic v0.5.7-v3refs // indirect
108-
github.com/google/go-cmp v0.5.9 // indirect
112+
github.com/google/go-cmp v0.6.0 // indirect
109113
github.com/google/gofuzz v1.2.0 // indirect
110-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
114+
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
111115
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
112-
github.com/google/uuid v1.3.0 // indirect
116+
github.com/google/uuid v1.3.1 // indirect
113117
github.com/gorilla/mux v1.8.0 // indirect
114118
github.com/gosuri/uitable v0.0.4 // indirect
115119
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
116120
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
117-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
121+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
118122
github.com/h2non/filetype v1.1.1 // indirect
119123
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
120124
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -130,7 +134,8 @@ require (
130134
github.com/josharian/intern v1.0.0 // indirect
131135
github.com/json-iterator/go v1.1.12 // indirect
132136
github.com/kisielk/errcheck v1.5.0 // indirect
133-
github.com/klauspost/compress v1.16.0 // indirect
137+
github.com/klauspost/compress v1.16.7 // indirect
138+
github.com/klauspost/pgzip v1.2.6 // indirect
134139
github.com/kylelemons/godebug v1.1.0 // indirect
135140
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
136141
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
@@ -140,13 +145,13 @@ require (
140145
github.com/mailru/easyjson v0.7.7 // indirect
141146
github.com/mattn/go-colorable v0.1.13 // indirect
142147
github.com/mattn/go-isatty v0.0.17 // indirect
143-
github.com/mattn/go-runewidth v0.0.9 // indirect
144-
github.com/mattn/go-sqlite3 v1.14.16 // indirect
148+
github.com/mattn/go-runewidth v0.0.15 // indirect
149+
github.com/mattn/go-sqlite3 v1.14.17 // indirect
145150
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
146151
github.com/mitchellh/copystructure v1.2.0 // indirect
147152
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
148153
github.com/mitchellh/hashstructure v1.0.0 // indirect
149-
github.com/mitchellh/mapstructure v1.4.1 // indirect
154+
github.com/mitchellh/mapstructure v1.5.0 // indirect
150155
github.com/mitchellh/reflectwalk v1.0.2 // indirect
151156
github.com/moby/locker v1.0.1 // indirect
152157
github.com/moby/spdystream v0.2.0 // indirect
@@ -158,9 +163,11 @@ require (
158163
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
159164
github.com/morikuni/aec v1.0.0 // indirect
160165
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
161-
github.com/onsi/gomega v1.27.7 // indirect
166+
github.com/onsi/gomega v1.27.10 // indirect
162167
github.com/opencontainers/go-digest v1.0.0 // indirect
163-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
168+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
169+
github.com/opencontainers/runc v1.1.9 // indirect
170+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
164171
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
165172
github.com/otiai10/copy v1.12.0 // indirect
166173
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
@@ -171,13 +178,17 @@ require (
171178
github.com/prometheus/client_model v0.4.0 // indirect
172179
github.com/prometheus/common v0.42.0 // indirect
173180
github.com/prometheus/procfs v0.9.0 // indirect
181+
github.com/rivo/uniseg v0.4.4 // indirect
174182
github.com/rubenv/sql-migrate v1.3.1 // indirect
175183
github.com/russross/blackfriday/v2 v2.1.0 // indirect
176184
github.com/shopspring/decimal v1.3.1 // indirect
177185
github.com/spf13/cast v1.5.0 // indirect
178186
github.com/spf13/pflag v1.0.5 // indirect
179187
github.com/spiffe/go-spiffe/v2 v2.0.0 // indirect
180188
github.com/stoewer/go-strcase v1.2.0 // indirect
189+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
190+
github.com/ulikunitz/xz v0.5.11 // indirect
191+
github.com/vbatts/tar-split v0.11.5 // indirect
181192
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
182193
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
183194
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
@@ -188,37 +199,38 @@ require (
188199
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
189200
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
190201
go.opencensus.io v0.24.0 // indirect
191-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
192-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
193-
go.opentelemetry.io/otel v1.14.0 // indirect
194-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
195-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
196-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
197-
go.opentelemetry.io/otel/metric v0.37.0 // indirect
198-
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
199-
go.opentelemetry.io/otel/trace v1.14.0 // indirect
200-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
202+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.44.0 // indirect
203+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
204+
go.opentelemetry.io/otel v1.20.0 // indirect
205+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
206+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
207+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
208+
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
209+
go.opentelemetry.io/otel/trace v1.20.0 // indirect
210+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
201211
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
202212
go.uber.org/atomic v1.7.0 // indirect
203213
go.uber.org/multierr v1.6.0 // indirect
204214
go.uber.org/zap v1.24.0 // indirect
205215
golang.org/x/crypto v0.14.0 // indirect
206-
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
216+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
207217
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
208-
golang.org/x/mod v0.10.0 // indirect
218+
golang.org/x/mod v0.12.0 // indirect
209219
golang.org/x/net v0.17.0 // indirect
210-
golang.org/x/oauth2 v0.5.0 // indirect
211-
golang.org/x/sync v0.2.0 // indirect
212-
golang.org/x/sys v0.13.0 // indirect
220+
golang.org/x/oauth2 v0.12.0 // indirect
221+
golang.org/x/sync v0.3.0 // indirect
222+
golang.org/x/sys v0.14.0 // indirect
213223
golang.org/x/term v0.13.0 // indirect
214224
golang.org/x/text v0.13.0 // indirect
215225
golang.org/x/time v0.3.0 // indirect
216-
golang.org/x/tools v0.9.1 // indirect
226+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
217227
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
218228
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
219229
google.golang.org/appengine v1.6.7 // indirect
220-
google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 // indirect
221-
google.golang.org/grpc v1.54.0 // indirect
230+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
231+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
232+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
233+
google.golang.org/grpc v1.59.0 // indirect
222234
gopkg.in/inf.v0 v0.9.1 // indirect
223235
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
224236
gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 // indirect
@@ -235,7 +247,7 @@ require (
235247
k8s.io/kms v0.27.7 // indirect
236248
k8s.io/kube-aggregator v0.25.3 // indirect
237249
k8s.io/kubectl v0.27.7 // indirect
238-
oras.land/oras-go v1.2.3 // indirect
250+
oras.land/oras-go v1.2.4 // indirect
239251
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
240252
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
241253
sigs.k8s.io/kustomize/api v0.13.2 // indirect

0 commit comments

Comments
 (0)