Skip to content

Commit 5e23ef5

Browse files
joelanfordjoelanford
authored
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]>
1 parent 39df3b7 commit 5e23ef5

File tree

17 files changed

+312
-1257
lines changed

17 files changed

+312
-1257
lines changed

‎Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ lint:
8888
codegen:
8989
protoc -I pkg/api/ --go_out=pkg/api pkg/api/*.proto
9090
protoc -I pkg/api/ --go-grpc_out=pkg/api pkg/api/*.proto
91-
protoc -I pkg/api/grpc_health_v1 --go_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
92-
protoc -I pkg/api/grpc_health_v1 --go-grpc_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
9391

9492
.PHONY: generate-fakes
9593
generate-fakes:

‎alpha/action/list_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ foo Foo Operator beta
2828
{
2929
name: "Error/UnknownIndex",
3030
list: ListPackages{IndexReference: "unknown-index"},
31-
expectedErr: `render reference "unknown-index": error resolving name for image ref unknown-index: object required`,
31+
expectedErr: `render reference "unknown-index": repository name must be canonical`,
3232
},
3333
}
3434
for _, s := range specs {
@@ -79,7 +79,7 @@ foo stable foo.v0.2.0
7979
{
8080
name: "Error/UnknownIndex",
8181
list: ListChannels{IndexReference: "unknown-index"},
82-
expectedErr: `render reference "unknown-index": error resolving name for image ref unknown-index: object required`,
82+
expectedErr: `render reference "unknown-index": repository name must be canonical`,
8383
},
8484
{
8585
name: "Error/UnknownPackage",
@@ -138,7 +138,7 @@ foo stable foo.v0.2.0 foo.v0.1.0 foo.v0.1.1,foo.v0.1.2 <0.2.0 tes
138138
{
139139
name: "Error/UnknownIndex",
140140
list: ListBundles{IndexReference: "unknown-index"},
141-
expectedErr: `render reference "unknown-index": error resolving name for image ref unknown-index: object required`,
141+
expectedErr: `render reference "unknown-index": repository name must be canonical`,
142142
},
143143
{
144144
name: "Error/UnknownPackage",

‎cmd/configmap-server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import (
88
"github.com/sirupsen/logrus"
99
"github.com/spf13/cobra"
1010
"google.golang.org/grpc"
11+
health "google.golang.org/grpc/health/grpc_health_v1"
1112
"google.golang.org/grpc/reflection"
1213
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1314
"k8s.io/client-go/kubernetes"
1415
"k8s.io/client-go/rest"
1516
"k8s.io/client-go/tools/clientcmd"
1617

1718
"github.com/operator-framework/operator-registry/pkg/api"
18-
health "github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1"
1919
"github.com/operator-framework/operator-registry/pkg/lib/dns"
2020
"github.com/operator-framework/operator-registry/pkg/lib/graceful"
2121
"github.com/operator-framework/operator-registry/pkg/lib/log"

‎cmd/opm/registry/serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"github.com/sirupsen/logrus"
1313
"github.com/spf13/cobra"
1414
"google.golang.org/grpc"
15+
health "google.golang.org/grpc/health/grpc_health_v1"
1516
"google.golang.org/grpc/reflection"
1617

1718
"github.com/operator-framework/operator-registry/pkg/api"
18-
health "github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1"
1919
"github.com/operator-framework/operator-registry/pkg/lib/dns"
2020
"github.com/operator-framework/operator-registry/pkg/lib/graceful"
2121
"github.com/operator-framework/operator-registry/pkg/lib/log"

‎cmd/opm/serve/serve.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import (
1616
"github.com/sirupsen/logrus"
1717
"github.com/spf13/cobra"
1818
"google.golang.org/grpc"
19+
health "google.golang.org/grpc/health/grpc_health_v1"
1920
"google.golang.org/grpc/reflection"
2021

2122
"github.com/operator-framework/operator-registry/pkg/api"
22-
health "github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1"
2323
"github.com/operator-framework/operator-registry/pkg/cache"
2424
"github.com/operator-framework/operator-registry/pkg/lib/dns"
2525
"github.com/operator-framework/operator-registry/pkg/lib/graceful"

‎cmd/registry-server/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"github.com/sirupsen/logrus"
1111
"github.com/spf13/cobra"
1212
"google.golang.org/grpc"
13+
health "google.golang.org/grpc/health/grpc_health_v1"
1314
"google.golang.org/grpc/reflection"
1415

1516
"github.com/operator-framework/operator-registry/pkg/api"
16-
health "github.com/operator-framework/operator-registry/pkg/api/grpc_health_v1"
1717
"github.com/operator-framework/operator-registry/pkg/lib/dns"
1818
"github.com/operator-framework/operator-registry/pkg/lib/graceful"
1919
"github.com/operator-framework/operator-registry/pkg/lib/log"

‎go.mod

Lines changed: 66 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@ module github.com/operator-framework/operator-registry
33
go 1.20
44

55
require (
6-
github.com/adrg/xdg v0.4.0
76
github.com/blang/semver/v4 v4.0.0
8-
github.com/containerd/containerd v1.6.22
9-
github.com/docker/cli v20.10.12+incompatible
7+
github.com/containerd/containerd v1.7.6
8+
github.com/containers/common v0.56.0
9+
github.com/containers/image/v5 v5.28.0
10+
github.com/docker/cli v23.0.5+incompatible
1011
github.com/docker/distribution v2.8.2+incompatible
11-
github.com/docker/docker v20.10.24+incompatible
1212
github.com/ghodss/yaml v1.0.0
1313
github.com/golang-migrate/migrate/v4 v4.16.1
1414
github.com/golang/mock v1.6.0
15-
github.com/google/go-cmp v0.5.9
15+
github.com/google/go-cmp v0.6.0
1616
github.com/grpc-ecosystem/grpc-health-probe v0.4.11
1717
github.com/h2non/filetype v1.1.1
1818
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
1919
github.com/joelanford/ignore v0.0.0-20210607151042-0d25dc18b62d
20-
github.com/mattn/go-sqlite3 v1.14.16
20+
github.com/mattn/go-sqlite3 v1.14.17
2121
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
22-
github.com/onsi/ginkgo/v2 v2.9.5
23-
github.com/onsi/gomega v1.27.7
22+
github.com/onsi/ginkgo/v2 v2.12.0
23+
github.com/onsi/gomega v1.27.10
2424
github.com/opencontainers/go-digest v1.0.0
25-
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b
25+
github.com/opencontainers/image-spec v1.1.0-rc4
2626
github.com/operator-framework/api v0.19.0
2727
github.com/otiai10/copy v1.2.0
2828
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
2929
github.com/pkg/errors v0.9.1
30-
github.com/sirupsen/logrus v1.9.2
30+
github.com/sirupsen/logrus v1.9.3
3131
github.com/spf13/cobra v1.7.0
32-
github.com/stretchr/testify v1.8.3
32+
github.com/stretchr/testify v1.8.4
3333
go.etcd.io/bbolt v1.3.7
34-
golang.org/x/mod v0.10.0
34+
golang.org/x/mod v0.12.0
3535
golang.org/x/net v0.17.0
36-
golang.org/x/sync v0.2.0
37-
golang.org/x/sys v0.13.0
36+
golang.org/x/sync v0.3.0
37+
golang.org/x/sys v0.14.0
3838
golang.org/x/text v0.13.0
39-
google.golang.org/grpc v1.54.0
40-
google.golang.org/grpc/cmd/protoc-gen-go-grpc v0.0.0-20200709232328-d8193ee9cc3e
41-
google.golang.org/protobuf v1.30.0
39+
google.golang.org/grpc v1.59.0
40+
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.3.0
41+
google.golang.org/protobuf v1.31.0
4242
gopkg.in/yaml.v2 v2.4.0
4343
k8s.io/api v0.27.7
4444
k8s.io/apiextensions-apiserver v0.27.7
@@ -51,26 +51,32 @@ require (
5151
)
5252

5353
require (
54+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5455
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
55-
github.com/BurntSushi/toml v0.3.1 // indirect
56+
github.com/BurntSushi/toml v1.3.2 // indirect
5657
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5758
github.com/Microsoft/go-winio v0.6.1 // indirect
58-
github.com/Microsoft/hcsshim v0.9.8 // indirect
59+
github.com/Microsoft/hcsshim v0.12.0-rc.0 // indirect
5960
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
6061
github.com/alessio/shellescape v1.4.1 // indirect
6162
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
62-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
63+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6364
github.com/beorn7/perks v1.0.1 // indirect
6465
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
6566
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
6667
github.com/bugsnag/panicwrap v1.2.0 // indirect
67-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
68+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
6869
github.com/cespare/xxhash/v2 v2.2.0 // indirect
69-
github.com/containerd/cgroups v1.0.4 // indirect
70-
github.com/containerd/continuity v0.3.0 // indirect
71-
github.com/containerd/ttrpc v1.1.2 // indirect
70+
github.com/containerd/cgroups/v3 v3.0.2 // indirect
71+
github.com/containerd/continuity v0.4.2 // indirect
72+
github.com/containerd/ttrpc v1.2.2 // indirect
73+
github.com/containerd/typeurl/v2 v2.1.1 // indirect
74+
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
75+
github.com/containers/ocicrypt v1.1.8 // indirect
76+
github.com/containers/storage v1.50.2 // indirect
7277
github.com/davecgh/go-spew v1.1.1 // indirect
73-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
78+
github.com/docker/docker v24.0.6+incompatible // indirect
79+
github.com/docker/docker-credential-helpers v0.8.0 // indirect
7480
github.com/docker/go-connections v0.4.0 // indirect
7581
github.com/docker/go-metrics v0.0.1 // indirect
7682
github.com/docker/go-units v0.5.0 // indirect
@@ -79,15 +85,16 @@ require (
7985
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
8086
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
8187
github.com/felixge/httpsnoop v1.0.3 // indirect
88+
github.com/fsnotify/fsnotify v1.6.0 // indirect
8289
github.com/garyburd/redigo v1.6.0 // indirect
8390
github.com/go-git/gcfg v1.5.0 // indirect
8491
github.com/go-git/go-billy/v5 v5.1.0 // indirect
8592
github.com/go-git/go-git/v5 v5.3.0 // indirect
86-
github.com/go-logr/logr v1.2.4 // indirect
93+
github.com/go-logr/logr v1.3.0 // indirect
8794
github.com/go-logr/stdr v1.2.2 // indirect
8895
github.com/go-openapi/jsonpointer v0.19.6 // indirect
89-
github.com/go-openapi/jsonreference v0.20.1 // indirect
90-
github.com/go-openapi/swag v0.22.3 // indirect
96+
github.com/go-openapi/jsonreference v0.20.2 // indirect
97+
github.com/go-openapi/swag v0.22.4 // indirect
9198
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
9299
github.com/gofrs/uuid v3.3.0+incompatible // indirect
93100
github.com/gogo/protobuf v1.3.2 // indirect
@@ -96,31 +103,36 @@ require (
96103
github.com/google/cel-go v0.15.3 // indirect
97104
github.com/google/gnostic v0.5.7-v3refs // indirect
98105
github.com/google/gofuzz v1.2.0 // indirect
99-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
100-
github.com/google/uuid v1.3.0 // indirect
106+
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
107+
github.com/google/uuid v1.3.1 // indirect
101108
github.com/gorilla/handlers v1.4.2 // indirect
102109
github.com/gorilla/mux v1.8.0 // indirect
103-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
104-
github.com/imdario/mergo v0.3.12 // indirect
110+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
111+
github.com/hashicorp/errwrap v1.1.0 // indirect
112+
github.com/hashicorp/go-multierror v1.1.1 // indirect
113+
github.com/imdario/mergo v0.3.13 // indirect
105114
github.com/inconshreveable/mousetrap v1.1.0 // indirect
106115
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
107116
github.com/josharian/intern v1.0.0 // indirect
108117
github.com/json-iterator/go v1.1.12 // indirect
109118
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
110-
github.com/klauspost/compress v1.13.6 // indirect
119+
github.com/klauspost/compress v1.16.7 // indirect
120+
github.com/klauspost/pgzip v1.2.6 // indirect
111121
github.com/mailru/easyjson v0.7.7 // indirect
112-
github.com/mattn/go-isatty v0.0.12 // indirect
122+
github.com/mattn/go-isatty v0.0.17 // indirect
113123
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
114124
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
115-
github.com/mitchellh/mapstructure v1.4.1 // indirect
125+
github.com/mitchellh/mapstructure v1.5.0 // indirect
116126
github.com/moby/locker v1.0.1 // indirect
117127
github.com/moby/spdystream v0.2.0 // indirect
118128
github.com/moby/sys/mountinfo v0.6.2 // indirect
129+
github.com/moby/sys/sequential v0.5.0 // indirect
119130
github.com/moby/term v0.5.0 // indirect
120131
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
121132
github.com/modern-go/reflect2 v1.0.2 // indirect
122-
github.com/morikuni/aec v1.0.0 // indirect
123133
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
134+
github.com/opencontainers/runc v1.1.9 // indirect
135+
github.com/opencontainers/runtime-spec v1.1.0 // indirect
124136
github.com/pelletier/go-toml v1.9.5 // indirect
125137
github.com/pmezard/go-difflib v1.0.0 // indirect
126138
github.com/prometheus/client_golang v1.15.1 // indirect
@@ -131,28 +143,32 @@ require (
131143
github.com/spf13/pflag v1.0.5 // indirect
132144
github.com/spiffe/go-spiffe/v2 v2.0.0 // indirect
133145
github.com/stoewer/go-strcase v1.2.0 // indirect
146+
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
147+
github.com/ulikunitz/xz v0.5.11 // indirect
148+
github.com/vbatts/tar-split v0.11.5 // indirect
134149
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
135150
github.com/yvasiyarov/gorelic v0.0.7 // indirect
136151
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
137152
github.com/zeebo/errs v1.3.0 // indirect
138153
go.opencensus.io v0.24.0 // indirect
139-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
140-
go.opentelemetry.io/otel v1.10.0 // indirect
141-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
142-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
143-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 // indirect
144-
go.opentelemetry.io/otel/metric v0.31.0 // indirect
145-
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
146-
go.opentelemetry.io/otel/trace v1.10.0 // indirect
147-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
154+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
155+
go.opentelemetry.io/otel v1.20.0 // indirect
156+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
157+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
158+
go.opentelemetry.io/otel/metric v1.20.0 // indirect
159+
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
160+
go.opentelemetry.io/otel/trace v1.20.0 // indirect
161+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
148162
golang.org/x/crypto v0.14.0 // indirect
149-
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
150-
golang.org/x/oauth2 v0.5.0 // indirect
163+
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
164+
golang.org/x/oauth2 v0.12.0 // indirect
151165
golang.org/x/term v0.13.0 // indirect
152166
golang.org/x/time v0.3.0 // indirect
153-
golang.org/x/tools v0.9.1 // indirect
167+
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
154168
google.golang.org/appengine v1.6.7 // indirect
155-
google.golang.org/genproto v0.0.0-20230525154841-bd750badd5c6 // indirect
169+
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
170+
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
171+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
156172
gopkg.in/inf.v0 v0.9.1 // indirect
157173
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
158174
gopkg.in/warnings.v0 v0.1.2 // indirect
@@ -161,7 +177,7 @@ require (
161177
k8s.io/component-base v0.27.7 // indirect
162178
k8s.io/klog/v2 v2.90.1 // indirect
163179
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
164-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
180+
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5 // indirect
165181
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
166182
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
167183
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

0 commit comments

Comments
 (0)