Skip to content

Commit 57aa443

Browse files
anik120ci-robot
anik120
authored and
ci-robot
committed
migrate containers libs to new mono-repo (#1799)
Ref: https://blog.podman.io/2025/08/upcoming-migration-of-three-containers-repositories-to-monorepo/ Signed-off-by: Anik Bhattacharjee <anbhatta@redhat.com> Upstream-repository: operator-registry Upstream-commit: 541ff1a2fa40fea69776dcf1e806b3a00a087942
1 parent cdba3e5 commit 57aa443

File tree

340 files changed

+1416
-676
lines changed

Some content is hidden

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

340 files changed

+1416
-676
lines changed

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,8 @@ require (
6565
github.com/containerd/platforms v0.2.1 // indirect
6666
github.com/containerd/ttrpc v1.2.7 // indirect
6767
github.com/containerd/typeurl/v2 v2.2.3 // indirect
68-
github.com/containers/common v0.64.2 // indirect
69-
github.com/containers/image/v5 v5.36.2 // indirect
7068
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
7169
github.com/containers/ocicrypt v1.2.1 // indirect
72-
github.com/containers/storage v1.59.1 // indirect
7370
github.com/coreos/go-semver v0.3.1 // indirect
7471
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
7572
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
@@ -162,14 +159,14 @@ require (
162159
github.com/otiai10/mint v1.6.3 // indirect
163160
github.com/pkg/errors v0.9.1 // indirect
164161
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
165-
github.com/proglottis/gpgme v0.1.4 // indirect
162+
github.com/proglottis/gpgme v0.1.5 // indirect
166163
github.com/prometheus/client_golang v1.23.2 // indirect
167164
github.com/prometheus/client_model v0.6.2 // indirect
168165
github.com/prometheus/common v0.66.1 // indirect
169166
github.com/prometheus/procfs v0.16.1 // indirect
170167
github.com/rivo/uniseg v0.4.7 // indirect
171168
github.com/russross/blackfriday/v2 v2.1.0 // indirect
172-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
169+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
173170
github.com/sigstore/fulcio v1.7.1 // indirect
174171
github.com/sigstore/protobuf-specs v0.4.3 // indirect
175172
github.com/sigstore/sigstore v1.9.5 // indirect
@@ -200,6 +197,9 @@ require (
200197
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
201198
go.opentelemetry.io/otel/trace v1.37.0 // indirect
202199
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
200+
go.podman.io/common v0.65.0 // indirect
201+
go.podman.io/image/v5 v5.37.0 // indirect
202+
go.podman.io/storage v1.60.0 // indirect
203203
go.uber.org/automaxprocs v1.6.0 // indirect
204204
go.uber.org/multierr v1.11.0 // indirect
205205
go.uber.org/zap v1.27.0 // indirect

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,16 +1433,10 @@ github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRq
14331433
github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
14341434
github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
14351435
github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
1436-
github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I=
1437-
github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4=
1438-
github.com/containers/image/v5 v5.36.2 h1:GcxYQyAHRF/pLqR4p4RpvKllnNL8mOBn0eZnqJbfTwk=
1439-
github.com/containers/image/v5 v5.36.2/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4=
14401436
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
14411437
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
14421438
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
14431439
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
1444-
github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHgIqDs=
1445-
github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0=
14461440
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
14471441
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
14481442
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -2018,8 +2012,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
20182012
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
20192013
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
20202014
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
2021-
github.com/proglottis/gpgme v0.1.4 h1:3nE7YNA70o2aLjcg63tXMOhPD7bplfE5CBdV+hLAm2M=
2022-
github.com/proglottis/gpgme v0.1.4/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
2015+
github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=
2016+
github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
20232017
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
20242018
github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
20252019
github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
@@ -2073,8 +2067,8 @@ github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEV
20732067
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
20742068
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
20752069
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
2076-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc=
2077-
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
2070+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=
2071+
github.com/secure-systems-lab/go-securesystemslib v0.9.1/go.mod h1:np53YzT0zXGMv6x4iEWc9Z59uR+x+ndLwCLqPYpLXVU=
20782072
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
20792073
github.com/sigstore/fulcio v1.7.1 h1:RcoW20Nz49IGeZyu3y9QYhyyV3ZKQ85T+FXPKkvE+aQ=
20802074
github.com/sigstore/fulcio v1.7.1/go.mod h1:7lYY+hsd8Dt+IvKQRC+KEhWpCZ/GlmNvwIa5JhypMS8=
@@ -2270,6 +2264,12 @@ go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI
22702264
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
22712265
go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
22722266
go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
2267+
go.podman.io/common v0.65.0 h1:8JNl25U4VpKDkFHSymSPm4te7ZQHJbfAB/l2FqtmYEg=
2268+
go.podman.io/common v0.65.0/go.mod h1:+lJu8KHeoDQsD9HDdiFaMaOUiqPLQnK406WuLnqM7Z0=
2269+
go.podman.io/image/v5 v5.37.0 h1:yzgQybwuWIIeK63hu+mQqna/wOh96XD5cpVc6j8Dg5M=
2270+
go.podman.io/image/v5 v5.37.0/go.mod h1:+s2Sx5dia/jVeT8tI3r2NAPrARMiDdbEq3QPIQogx3I=
2271+
go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao=
2272+
go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4=
22732273
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
22742274
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
22752275
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=

‎staging/operator-registry/go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ require (
77
github.com/blang/semver/v4 v4.0.0
88
github.com/containerd/containerd v1.7.28
99
github.com/containerd/errdefs v1.0.0
10-
github.com/containers/common v0.64.2
11-
github.com/containers/image/v5 v5.36.2
1210
github.com/distribution/distribution/v3 v3.0.0
1311
github.com/distribution/reference v0.6.0
1412
github.com/docker/cli v28.4.0+incompatible
@@ -35,6 +33,8 @@ require (
3533
github.com/stretchr/testify v1.11.1
3634
github.com/tidwall/btree v1.8.1
3735
go.etcd.io/bbolt v1.4.3
36+
go.podman.io/common v0.65.0
37+
go.podman.io/image/v5 v5.37.0
3838
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
3939
golang.org/x/mod v0.28.0
4040
golang.org/x/net v0.44.0
@@ -82,14 +82,13 @@ require (
8282
github.com/containerd/typeurl/v2 v2.2.3 // indirect
8383
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8484
github.com/containers/ocicrypt v1.2.1 // indirect
85-
github.com/containers/storage v1.59.1 // indirect
8685
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
8786
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8887
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
8988
github.com/docker/distribution v2.8.3+incompatible // indirect
9089
github.com/docker/docker v28.3.3+incompatible // indirect
9190
github.com/docker/docker-credential-helpers v0.9.3 // indirect
92-
github.com/docker/go-connections v0.5.0 // indirect
91+
github.com/docker/go-connections v0.6.0 // indirect
9392
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
9493
github.com/docker/go-metrics v0.0.1 // indirect
9594
github.com/docker/go-units v0.5.0 // indirect
@@ -150,7 +149,7 @@ require (
150149
github.com/otiai10/mint v1.6.3 // indirect
151150
github.com/pelletier/go-toml v1.9.5 // indirect
152151
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
153-
github.com/proglottis/gpgme v0.1.4 // indirect
152+
github.com/proglottis/gpgme v0.1.5 // indirect
154153
github.com/prometheus/client_golang v1.22.0 // indirect
155154
github.com/prometheus/client_model v0.6.2 // indirect
156155
github.com/prometheus/common v0.65.0 // indirect
@@ -160,7 +159,7 @@ require (
160159
github.com/redis/go-redis/v9 v9.10.0 // indirect
161160
github.com/rivo/uniseg v0.4.7 // indirect
162161
github.com/russross/blackfriday/v2 v2.1.0 // indirect
163-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
162+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
164163
github.com/sigstore/fulcio v1.7.1 // indirect
165164
github.com/sigstore/protobuf-specs v0.4.3 // indirect
166165
github.com/sigstore/sigstore v1.9.5 // indirect
@@ -198,6 +197,7 @@ require (
198197
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
199198
go.opentelemetry.io/otel/trace v1.37.0 // indirect
200199
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
200+
go.podman.io/storage v1.60.0 // indirect
201201
go.uber.org/automaxprocs v1.6.0 // indirect
202202
go.yaml.in/yaml/v2 v2.4.2 // indirect
203203
go.yaml.in/yaml/v3 v3.0.4 // indirect

‎staging/operator-registry/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,14 @@ github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRq
6969
github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
7070
github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
7171
github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
72-
github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I=
73-
github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4=
74-
github.com/containers/image/v5 v5.36.2 h1:GcxYQyAHRF/pLqR4p4RpvKllnNL8mOBn0eZnqJbfTwk=
75-
github.com/containers/image/v5 v5.36.2/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4=
7672
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
7773
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
7874
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
7975
github.com/containers/ocicrypt v1.2.1/go.mod h1:aD0AAqfMp0MtwqWgHM1bUwe1anx0VazI108CRrSKINQ=
80-
github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHgIqDs=
81-
github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0=
8276
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
8377
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
84-
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
85-
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
78+
github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
79+
github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
8680
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
8781
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
8882
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -106,8 +100,8 @@ github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjY
106100
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
107101
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
108102
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
109-
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
110-
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
103+
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
104+
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
111105
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 h1:EHZfspsnLAz8Hzccd67D5abwLiqoqym2jz/jOS39mCk=
112106
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
113107
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
@@ -335,8 +329,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
335329
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
336330
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
337331
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
338-
github.com/proglottis/gpgme v0.1.4 h1:3nE7YNA70o2aLjcg63tXMOhPD7bplfE5CBdV+hLAm2M=
339-
github.com/proglottis/gpgme v0.1.4/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
332+
github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=
333+
github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
340334
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
341335
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
342336
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
@@ -373,8 +367,8 @@ github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEV
373367
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
374368
github.com/sclevine/spec v1.4.0 h1:z/Q9idDcay5m5irkZ28M7PtQM4aOISzOpj4bUPkDee8=
375369
github.com/sclevine/spec v1.4.0/go.mod h1:LvpgJaFyvQzRvc1kaDs0bulYwzC70PbiYjC4QnFHkOM=
376-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc=
377-
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
370+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=
371+
github.com/secure-systems-lab/go-securesystemslib v0.9.1/go.mod h1:np53YzT0zXGMv6x4iEWc9Z59uR+x+ndLwCLqPYpLXVU=
378372
github.com/sigstore/fulcio v1.7.1 h1:RcoW20Nz49IGeZyu3y9QYhyyV3ZKQ85T+FXPKkvE+aQ=
379373
github.com/sigstore/fulcio v1.7.1/go.mod h1:7lYY+hsd8Dt+IvKQRC+KEhWpCZ/GlmNvwIa5JhypMS8=
380374
github.com/sigstore/protobuf-specs v0.4.3 h1:kRgJ+ciznipH9xhrkAbAEHuuxD3GhYnGC873gZpjJT4=
@@ -489,6 +483,12 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
489483
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
490484
go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
491485
go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
486+
go.podman.io/common v0.65.0 h1:8JNl25U4VpKDkFHSymSPm4te7ZQHJbfAB/l2FqtmYEg=
487+
go.podman.io/common v0.65.0/go.mod h1:+lJu8KHeoDQsD9HDdiFaMaOUiqPLQnK406WuLnqM7Z0=
488+
go.podman.io/image/v5 v5.37.0 h1:yzgQybwuWIIeK63hu+mQqna/wOh96XD5cpVc6j8Dg5M=
489+
go.podman.io/image/v5 v5.37.0/go.mod h1:+s2Sx5dia/jVeT8tI3r2NAPrARMiDdbEq3QPIQogx3I=
490+
go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao=
491+
go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4=
492492
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
493493
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
494494
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

‎staging/operator-registry/pkg/image/buildahregistry/_options.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"path/filepath"
1111
"sync"
1212

13-
"github.com/containers/storage"
1413
"github.com/sirupsen/logrus"
14+
"go.podman.io/storage"
1515
)
1616

1717
type RegistryConfig struct {

‎staging/operator-registry/pkg/image/buildahregistry/_registry.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"path"
99
"time"
1010

11-
"github.com/containers/buildah"
12-
"github.com/containers/image/v5/types"
13-
"github.com/containers/storage"
1411
"github.com/sirupsen/logrus"
12+
"go.podman.io/buildah"
13+
"go.podman.io/image/v5/types"
14+
"go.podman.io/storage"
1515

1616
"github.com/operator-framework/operator-registry/pkg/image"
1717
)

‎staging/operator-registry/pkg/image/containerdregistry/registry.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/containerd/containerd/platforms"
2020
"github.com/containerd/containerd/remotes"
2121
"github.com/containerd/errdefs"
22-
"github.com/containers/image/v5/docker/reference"
2322
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2423
"github.com/sirupsen/logrus"
24+
"go.podman.io/image/v5/docker/reference"
2525
"k8s.io/apimachinery/pkg/util/wait"
2626
"k8s.io/client-go/util/retry"
2727

‎staging/operator-registry/pkg/image/containerdregistry/resolver.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77

88
"github.com/containerd/containerd/remotes"
99
"github.com/containerd/containerd/remotes/docker"
10-
"github.com/containers/common/pkg/auth"
11-
"github.com/containers/image/v5/pkg/docker/config"
12-
"github.com/containers/image/v5/types"
1310
dockerconfig "github.com/docker/cli/cli/config"
11+
"go.podman.io/common/pkg/auth"
12+
"go.podman.io/image/v5/pkg/docker/config"
13+
"go.podman.io/image/v5/types"
1414
)
1515

1616
func NewResolver(client *http.Client, configDir string, plainHTTP bool, repo string) (remotes.Resolver, error) {

‎staging/operator-registry/pkg/image/containersimageregistry/registry.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ import (
88
"path/filepath"
99

1010
"github.com/containerd/containerd/archive"
11-
"github.com/containers/common/pkg/auth"
12-
"github.com/containers/image/v5/copy"
13-
"github.com/containers/image/v5/docker"
14-
"github.com/containers/image/v5/docker/reference"
15-
"github.com/containers/image/v5/image"
16-
"github.com/containers/image/v5/oci/layout"
17-
"github.com/containers/image/v5/pkg/compression"
18-
"github.com/containers/image/v5/pkg/docker/config"
19-
"github.com/containers/image/v5/signature"
20-
"github.com/containers/image/v5/types"
2111
dockerconfig "github.com/docker/cli/cli/config"
12+
"go.podman.io/common/pkg/auth"
13+
"go.podman.io/image/v5/copy"
14+
"go.podman.io/image/v5/docker"
15+
"go.podman.io/image/v5/docker/reference"
16+
"go.podman.io/image/v5/image"
17+
"go.podman.io/image/v5/oci/layout"
18+
"go.podman.io/image/v5/pkg/compression"
19+
"go.podman.io/image/v5/pkg/docker/config"
20+
"go.podman.io/image/v5/signature"
21+
"go.podman.io/image/v5/types"
2222
"oras.land/oras-go/v2/content/oci"
2323

2424
orimage "github.com/operator-framework/operator-registry/pkg/image"

‎staging/operator-registry/pkg/image/registry_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ import (
1717
"sync"
1818
"testing"
1919

20-
"github.com/containers/image/v5/types"
2120
"github.com/distribution/distribution/v3"
2221
"github.com/distribution/reference"
2322
"github.com/opencontainers/go-digest"
2423
"github.com/sirupsen/logrus"
2524
"github.com/stretchr/testify/require"
25+
"go.podman.io/image/v5/types"
2626
"golang.org/x/mod/sumdb/dirhash"
2727

2828
libimage "github.com/operator-framework/operator-registry/internal/testutil/image"

0 commit comments

Comments
 (0)