Skip to content

Commit dda82e5

Browse files
authored
Restore image digest pinning (#5632)
Part of the image pinning logic is currently missing from master. This PR adds that back along with the released version of Operator Manifest Tools. Signed-off-by: Ryan King <[email protected]>
1 parent 258b57b commit dda82e5

File tree

3 files changed

+284
-72
lines changed

3 files changed

+284
-72
lines changed

go.mod

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/fatih/structtag v1.1.0
88
github.com/go-logr/logr v1.2.0
99
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0
10-
github.com/iancoleman/strcase v0.1.2
10+
github.com/iancoleman/strcase v0.2.0
1111
github.com/kr/text v0.2.0
1212
github.com/markbates/inflect v1.0.4
1313
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
@@ -17,15 +17,16 @@ require (
1717
github.com/operator-framework/helm-operator-plugins v0.0.9
1818
github.com/operator-framework/java-operator-plugins v0.3.0
1919
github.com/operator-framework/operator-lib v0.10.0
20+
github.com/operator-framework/operator-manifest-tools v0.2.0
2021
github.com/operator-framework/operator-registry v1.21.0
2122
github.com/prometheus/client_golang v1.11.0
2223
github.com/prometheus/client_model v0.2.0
2324
github.com/sergi/go-diff v1.1.0
2425
github.com/sirupsen/logrus v1.8.1
2526
github.com/spf13/afero v1.6.0
26-
github.com/spf13/cobra v1.2.1
27+
github.com/spf13/cobra v1.3.0
2728
github.com/spf13/pflag v1.0.5
28-
github.com/spf13/viper v1.8.1
29+
github.com/spf13/viper v1.10.0
2930
github.com/stretchr/testify v1.7.0
3031
github.com/thoas/go-funk v0.8.0
3132
golang.org/x/mod v0.5.1
@@ -45,7 +46,7 @@ require (
4546
)
4647

4748
require (
48-
cloud.google.com/go v0.81.0 // indirect
49+
cloud.google.com/go v0.99.0 // indirect
4950
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
5051
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
5152
github.com/Azure/go-autorest/autorest v0.11.18 // indirect
@@ -59,8 +60,8 @@ require (
5960
github.com/Masterminds/semver/v3 v3.1.1 // indirect
6061
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
6162
github.com/Masterminds/squirrel v1.5.0 // indirect
62-
github.com/Microsoft/go-winio v0.4.16 // indirect
63-
github.com/Microsoft/hcsshim v0.8.14 // indirect
63+
github.com/Microsoft/go-winio v0.5.1 // indirect
64+
github.com/Microsoft/hcsshim v0.8.23 // indirect
6465
github.com/PuerkitoBio/purell v1.1.1 // indirect
6566
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
6667
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
@@ -72,28 +73,29 @@ require (
7273
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
7374
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
7475
github.com/bugsnag/panicwrap v1.2.0 // indirect
75-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
76+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
7677
github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 // indirect
7778
github.com/cloudflare/cfssl v1.5.0 // indirect
78-
github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59 // indirect
79-
github.com/containerd/containerd v1.4.11 // indirect
80-
github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7 // indirect
81-
github.com/containerd/ttrpc v1.0.1 // indirect
82-
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
79+
github.com/containerd/cgroups v1.0.1 // indirect
80+
github.com/containerd/containerd v1.5.8 // indirect
81+
github.com/containerd/continuity v0.1.0 // indirect
82+
github.com/containerd/stargz-snapshotter/estargz v0.10.1 // indirect
83+
github.com/containerd/ttrpc v1.1.0 // indirect
84+
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
8385
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
8486
github.com/davecgh/go-spew v1.1.1 // indirect
8587
github.com/deislabs/oras v0.11.1 // indirect
8688
github.com/docker/cli v20.10.12+incompatible // indirect
8789
github.com/docker/distribution v2.7.1+incompatible // indirect
88-
github.com/docker/docker v17.12.0-ce-rc1.0.20200618181300-9dc6525e6118+incompatible // indirect
89-
github.com/docker/docker-credential-helpers v0.6.3 // indirect
90+
github.com/docker/docker v20.10.12+incompatible // indirect
91+
github.com/docker/docker-credential-helpers v0.6.4 // indirect
9092
github.com/docker/go-connections v0.4.0 // indirect
9193
github.com/docker/go-metrics v0.0.1 // indirect
9294
github.com/docker/go-units v0.4.0 // indirect
9395
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
9496
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
9597
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
96-
github.com/fatih/color v1.12.0 // indirect
98+
github.com/fatih/color v1.13.0 // indirect
9799
github.com/felixge/httpsnoop v1.0.1 // indirect
98100
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
99101
github.com/fsnotify/fsnotify v1.5.1 // indirect
@@ -116,9 +118,10 @@ require (
116118
github.com/google/cel-go v0.9.0 // indirect
117119
github.com/google/certificate-transparency-go v1.0.21 // indirect
118120
github.com/google/go-cmp v0.5.6 // indirect
121+
github.com/google/go-containerregistry v0.8.0 // indirect
119122
github.com/google/gofuzz v1.1.0 // indirect
120123
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
121-
github.com/google/uuid v1.1.2 // indirect
124+
github.com/google/uuid v1.2.0 // indirect
122125
github.com/googleapis/gnostic v0.5.5 // indirect
123126
github.com/gorilla/handlers v1.4.2 // indirect
124127
github.com/gorilla/mux v1.8.0 // indirect
@@ -136,19 +139,21 @@ require (
136139
github.com/josharian/intern v1.0.0 // indirect
137140
github.com/json-iterator/go v1.1.12 // indirect
138141
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
142+
github.com/klauspost/compress v1.14.1 // indirect
139143
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
140144
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
141145
github.com/lib/pq v1.10.0 // indirect
142146
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
143147
github.com/magiconair/properties v1.8.5 // indirect
144148
github.com/mailru/easyjson v0.7.6 // indirect
145-
github.com/mattn/go-colorable v0.1.8 // indirect
146-
github.com/mattn/go-isatty v0.0.12 // indirect
149+
github.com/mattn/go-colorable v0.1.12 // indirect
150+
github.com/mattn/go-isatty v0.0.14 // indirect
147151
github.com/mattn/go-runewidth v0.0.7 // indirect
148152
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
149153
github.com/mitchellh/copystructure v1.1.1 // indirect
154+
github.com/mitchellh/go-homedir v1.1.0 // indirect
150155
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
151-
github.com/mitchellh/mapstructure v1.4.1 // indirect
156+
github.com/mitchellh/mapstructure v1.4.3 // indirect
152157
github.com/mitchellh/reflectwalk v1.0.1 // indirect
153158
github.com/moby/spdystream v0.2.0 // indirect
154159
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 // indirect
@@ -159,10 +164,9 @@ require (
159164
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
160165
github.com/nxadm/tail v1.4.8 // indirect
161166
github.com/opencontainers/go-digest v1.0.0 // indirect
162-
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 // indirect
163-
github.com/opencontainers/runc v0.1.1 // indirect
167+
github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5 // indirect
164168
github.com/otiai10/copy v1.2.0 // indirect
165-
github.com/pelletier/go-toml v1.9.3 // indirect
169+
github.com/pelletier/go-toml v1.9.4 // indirect
166170
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
167171
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect
168172
github.com/pkg/errors v0.9.1 // indirect
@@ -172,13 +176,13 @@ require (
172176
github.com/rogpeppe/go-internal v1.4.0 // indirect
173177
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
174178
github.com/russross/blackfriday v1.5.2 // indirect
175-
github.com/russross/blackfriday/v2 v2.0.1 // indirect
179+
github.com/russross/blackfriday/v2 v2.1.0 // indirect
176180
github.com/shopspring/decimal v1.2.0 // indirect
177-
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
178-
github.com/spf13/cast v1.3.1 // indirect
181+
github.com/spf13/cast v1.4.1 // indirect
179182
github.com/spf13/jwalterweatherman v1.1.0 // indirect
180183
github.com/stoewer/go-strcase v1.2.0 // indirect
181184
github.com/subosito/gotenv v1.2.0 // indirect
185+
github.com/vbatts/tar-split v0.11.2 // indirect
182186
github.com/weppos/publicsuffix-go v0.13.0 // indirect
183187
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
184188
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
@@ -206,8 +210,8 @@ require (
206210
go.uber.org/multierr v1.6.0 // indirect
207211
go.uber.org/zap v1.19.1 // indirect
208212
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
209-
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
210-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
213+
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
214+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
211215
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
212216
golang.org/x/sys v0.0.0-20220224120231-95c6836cb0e7 // indirect
213217
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
@@ -217,13 +221,12 @@ require (
217221
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
218222
gomodules.xyz/orderedmap v0.1.0 // indirect
219223
google.golang.org/appengine v1.6.7 // indirect
220-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
221-
google.golang.org/grpc v1.41.0 // indirect
224+
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
225+
google.golang.org/grpc v1.43.0 // indirect
222226
google.golang.org/protobuf v1.27.1 // indirect
223-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
224227
gopkg.in/gorp.v1 v1.7.2 // indirect
225228
gopkg.in/inf.v0 v0.9.1 // indirect
226-
gopkg.in/ini.v1 v1.62.0 // indirect
229+
gopkg.in/ini.v1 v1.66.2 // indirect
227230
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
228231
gopkg.in/yaml.v2 v2.4.0 // indirect
229232
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
@@ -240,6 +243,8 @@ require (
240243
)
241244

242245
replace (
246+
// TODO(ryantking): investigate further, v1.5 breaks github.com/deislabs/oras, might be able to update whatever uses the old version of oras
247+
github.com/containerd/containerd => github.com/containerd/containerd v1.4.11
243248
// latest tag resolves to a very old version. this is only used for spinning up local test registries
244249
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
245250
github.com/mattn/go-sqlite3 => github.com/mattn/go-sqlite3 v1.10.0

0 commit comments

Comments
 (0)