Skip to content

Commit febdb59

Browse files
anik120anik120
authored
migrate containers libs to new mono-repo (#2195)
Ref: https://blog.podman.io/2025/08/upcoming-migration-of-three-containers-repositories-to-monorepo/
1 parent 3f782fd commit febdb59

File tree

13 files changed

+55
-48
lines changed

13 files changed

+55
-48
lines changed

‎cmd/catalogd/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"strings"
2929
"time"
3030

31-
"github.com/containers/image/v5/types"
3231
"github.com/spf13/cobra"
32+
"go.podman.io/image/v5/types"
3333
"k8s.io/apimachinery/pkg/runtime"
3434
k8stypes "k8s.io/apimachinery/pkg/types"
3535
apimachineryrand "k8s.io/apimachinery/pkg/util/rand"

‎cmd/operator-controller/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"strings"
2929
"time"
3030

31-
"github.com/containers/image/v5/types"
3231
"github.com/spf13/cobra"
32+
"go.podman.io/image/v5/types"
3333
rbacv1 "k8s.io/api/rbac/v1"
3434
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3535
apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1"

‎go.mod‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/blang/semver/v4 v4.0.0
99
github.com/cert-manager/cert-manager v1.18.2
1010
github.com/containerd/containerd v1.7.28
11-
github.com/containers/image/v5 v5.36.2
1211
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1312
github.com/fsnotify/fsnotify v1.9.0
1413
github.com/go-logr/logr v1.4.3
@@ -27,6 +26,7 @@ require (
2726
github.com/prometheus/common v0.66.1
2827
github.com/spf13/cobra v1.10.1
2928
github.com/stretchr/testify v1.11.1
29+
go.podman.io/image/v5 v5.37.0
3030
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b
3131
golang.org/x/mod v0.28.0
3232
golang.org/x/sync v0.17.0
@@ -80,21 +80,23 @@ require (
8080
github.com/containerd/errdefs/pkg v0.3.0 // indirect
8181
github.com/containerd/log v0.1.0 // indirect
8282
github.com/containerd/platforms v0.2.1 // indirect
83-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
83+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 // indirect
8484
github.com/containerd/ttrpc v1.2.7 // indirect
8585
github.com/containerd/typeurl/v2 v2.2.3 // indirect
8686
github.com/containers/common v0.64.1 // indirect
87+
github.com/containers/image/v5 v5.36.1 // indirect
8788
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect
8889
github.com/containers/ocicrypt v1.2.1 // indirect
8990
github.com/containers/storage v1.59.1 // indirect
91+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
9092
github.com/cyberphone/json-canonicalization v0.0.0-20241213102144-19d51d7fe467 // indirect
9193
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
9294
github.com/distribution/reference v0.6.0 // indirect
9395
github.com/docker/cli v28.3.3+incompatible // indirect
9496
github.com/docker/distribution v2.8.3+incompatible // indirect
9597
github.com/docker/docker v28.3.3+incompatible // indirect
9698
github.com/docker/docker-credential-helpers v0.9.3 // indirect
97-
github.com/docker/go-connections v0.5.0 // indirect
99+
github.com/docker/go-connections v0.6.0 // indirect
98100
github.com/docker/go-units v0.5.0 // indirect
99101
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
100102
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
@@ -187,14 +189,14 @@ require (
187189
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
188190
github.com/pkg/errors v0.9.1 // indirect
189191
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
190-
github.com/proglottis/gpgme v0.1.4 // indirect
192+
github.com/proglottis/gpgme v0.1.5 // indirect
191193
github.com/prometheus/client_model v0.6.2 // indirect
192194
github.com/prometheus/procfs v0.17.0 // indirect
193195
github.com/rivo/uniseg v0.4.7 // indirect
194196
github.com/rubenv/sql-migrate v1.8.0 // indirect
195197
github.com/russross/blackfriday/v2 v2.1.0 // indirect
196198
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
197-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
199+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
198200
github.com/shopspring/decimal v1.4.0 // indirect
199201
github.com/sigstore/fulcio v1.7.1 // indirect
200202
github.com/sigstore/protobuf-specs v0.4.3 // indirect
@@ -207,7 +209,7 @@ require (
207209
github.com/stoewer/go-strcase v1.3.1 // indirect
208210
github.com/stretchr/objx v0.5.2 // indirect
209211
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
210-
github.com/ulikunitz/xz v0.5.14 // indirect
212+
github.com/ulikunitz/xz v0.5.15 // indirect
211213
github.com/vbatts/tar-split v0.12.1 // indirect
212214
github.com/vbauerster/mpb/v8 v8.10.2 // indirect
213215
github.com/x448/float16 v0.8.4 // indirect
@@ -223,6 +225,7 @@ require (
223225
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
224226
go.opentelemetry.io/otel/trace v1.37.0 // indirect
225227
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
228+
go.podman.io/storage v1.60.0 // indirect
226229
go.yaml.in/yaml/v2 v2.4.2 // indirect
227230
go.yaml.in/yaml/v3 v3.0.4 // indirect
228231
golang.org/x/crypto v0.42.0 // indirect

‎go.sum‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,16 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
7171
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
7272
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
7373
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
74-
github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8=
75-
github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
74+
github.com/containerd/stargz-snapshotter/estargz v0.17.0 h1:+TyQIsR/zSFI1Rm31EQBwpAA1ovYgIKHy7kctL3sLcE=
75+
github.com/containerd/stargz-snapshotter/estargz v0.17.0/go.mod h1:s06tWAiJcXQo9/8AReBCIo/QxcXFZ2n4qfsRnpl71SM=
7676
github.com/containerd/ttrpc v1.2.7 h1:qIrroQvuOL9HQ1X6KHe2ohc7p+HP/0VE6XPU7elJRqQ=
7777
github.com/containerd/ttrpc v1.2.7/go.mod h1:YCXHsb32f+Sq5/72xHubdiJRQY9inL4a4ZQrAbN1q9o=
7878
github.com/containerd/typeurl/v2 v2.2.3 h1:yNA/94zxWdvYACdYO8zofhrTVuQY73fFU1y++dYSw40=
7979
github.com/containerd/typeurl/v2 v2.2.3/go.mod h1:95ljDnPfD3bAbDJRugOiShd/DlAAsxGtUBhJxIn7SCk=
8080
github.com/containers/common v0.64.1 h1:E8vSiL+B84/UCsyVSb70GoxY9cu+0bseLujm4EKF6GE=
8181
github.com/containers/common v0.64.1/go.mod h1:CtfQNHoCAZqWeXMwdShcsxmMJSeGRgKKMqAwRKmWrHE=
82-
github.com/containers/image/v5 v5.36.2 h1:GcxYQyAHRF/pLqR4p4RpvKllnNL8mOBn0eZnqJbfTwk=
83-
github.com/containers/image/v5 v5.36.2/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4=
82+
github.com/containers/image/v5 v5.36.1 h1:6zpXBqR59UcAzoKpa/By5XekeqFV+htWYfr65+Cgjqo=
83+
github.com/containers/image/v5 v5.36.1/go.mod h1:b4GMKH2z/5t6/09utbse2ZiLK/c72GuGLFdp7K69eA4=
8484
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=
8585
github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY=
8686
github.com/containers/ocicrypt v1.2.1 h1:0qIOTT9DoYwcKmxSt8QJt+VzMY18onl9jUXsxpVhSmM=
@@ -89,8 +89,8 @@ github.com/containers/storage v1.59.1 h1:11Zu68MXsEQGBBd+GadPrHPpWeqjKS8hJDGiAHg
8989
github.com/containers/storage v1.59.1/go.mod h1:KoAYHnAjP3/cTsRS+mmWZGkufSY2GACiKQ4V3ZLQnR0=
9090
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
9191
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
92-
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
93-
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
92+
github.com/coreos/go-systemd/v22 v22.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo=
93+
github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU=
9494
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
9595
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
9696
github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
@@ -118,8 +118,8 @@ github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjY
118118
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
119119
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
120120
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
121-
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
122-
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
121+
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
122+
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
123123
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 h1:EHZfspsnLAz8Hzccd67D5abwLiqoqym2jz/jOS39mCk=
124124
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
125125
github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8=
@@ -419,8 +419,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
419419
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
420420
github.com/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY=
421421
github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg=
422-
github.com/proglottis/gpgme v0.1.4 h1:3nE7YNA70o2aLjcg63tXMOhPD7bplfE5CBdV+hLAm2M=
423-
github.com/proglottis/gpgme v0.1.4/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
422+
github.com/proglottis/gpgme v0.1.5 h1:KCGyOw8sQ+SI96j6G8D8YkOGn+1TwbQTT9/zQXoVlz0=
423+
github.com/proglottis/gpgme v0.1.5/go.mod h1:5LoXMgpE4bttgwwdv9bLs/vwqv3qV7F4glEEZ7mRKrM=
424424
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
425425
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
426426
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
@@ -447,8 +447,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
447447
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
448448
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 h1:KRzFb2m7YtdldCEkzs6KqmJw4nqEVZGK7IN2kJkjTuQ=
449449
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
450-
github.com/secure-systems-lab/go-securesystemslib v0.9.0 h1:rf1HIbL64nUpEIZnjLZ3mcNEL9NBPB0iuVjyxvq3LZc=
451-
github.com/secure-systems-lab/go-securesystemslib v0.9.0/go.mod h1:DVHKMcZ+V4/woA/peqr+L0joiRXbPpQ042GgJckkFgw=
450+
github.com/secure-systems-lab/go-securesystemslib v0.9.1 h1:nZZaNz4DiERIQguNy0cL5qTdn9lR8XKHf4RUyG1Sx3g=
451+
github.com/secure-systems-lab/go-securesystemslib v0.9.1/go.mod h1:np53YzT0zXGMv6x4iEWc9Z59uR+x+ndLwCLqPYpLXVU=
452452
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
453453
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
454454
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
@@ -490,8 +490,8 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
490490
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
491491
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
492492
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
493-
github.com/ulikunitz/xz v0.5.14 h1:uv/0Bq533iFdnMHZdRBTOlaNMdb1+ZxXIlHDZHIHcvg=
494-
github.com/ulikunitz/xz v0.5.14/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
493+
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
494+
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
495495
github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
496496
github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
497497
github.com/vbauerster/mpb/v8 v8.10.2 h1:2uBykSHAYHekE11YvJhKxYmLATKHAGorZwFlyNw4hHM=
@@ -561,6 +561,10 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
561561
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
562562
go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
563563
go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
564+
go.podman.io/image/v5 v5.37.0 h1:yzgQybwuWIIeK63hu+mQqna/wOh96XD5cpVc6j8Dg5M=
565+
go.podman.io/image/v5 v5.37.0/go.mod h1:+s2Sx5dia/jVeT8tI3r2NAPrARMiDdbEq3QPIQogx3I=
566+
go.podman.io/storage v1.60.0 h1:bWNSrR58nxg39VNFDSx3m0AswbvyzPGOo5XsUfomTao=
567+
go.podman.io/storage v1.60.0/go.mod h1:NK+rsWJVuQeCM7ifv7cxD3abegWxwtW/3OkuSUJJoE4=
564568
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
565569
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
566570
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=

‎internal/catalogd/controllers/core/clustercatalog_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"sync"
2525
"time"
2626

27-
"github.com/containers/image/v5/docker/reference"
27+
"go.podman.io/image/v5/docker/reference"
2828
"k8s.io/apimachinery/pkg/api/equality"
2929
"k8s.io/apimachinery/pkg/api/meta"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎internal/catalogd/controllers/core/clustercatalog_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010
"testing/fstest"
1111
"time"
1212

13-
"github.com/containers/image/v5/docker/reference"
1413
"github.com/google/go-cmp/cmp"
1514
"github.com/google/go-cmp/cmp/cmpopts"
1615
"github.com/stretchr/testify/assert"
1716
"github.com/stretchr/testify/require"
17+
"go.podman.io/image/v5/docker/reference"
1818
"k8s.io/apimachinery/pkg/api/meta"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
"k8s.io/utils/ptr"

‎internal/shared/util/image/cache.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"time"
1616

1717
"github.com/containerd/containerd/archive"
18-
"github.com/containers/image/v5/docker/reference"
1918
"github.com/google/renameio/v2"
2019
"github.com/opencontainers/go-digest"
2120
ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1"
21+
"go.podman.io/image/v5/docker/reference"
2222
"helm.sh/helm/v3/pkg/chart"
2323
"helm.sh/helm/v3/pkg/registry"
2424
"sigs.k8s.io/controller-runtime/pkg/log"

‎internal/shared/util/image/cache_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"time"
1919

2020
"github.com/containerd/containerd/archive"
21-
"github.com/containers/image/v5/docker/reference"
2221
ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1"
2322
"github.com/stretchr/testify/assert"
2423
"github.com/stretchr/testify/require"
24+
"go.podman.io/image/v5/docker/reference"
2525
"helm.sh/helm/v3/pkg/registry"
2626

2727
fsutil "github.com/operator-framework/operator-controller/internal/shared/util/fs"

‎internal/shared/util/image/helm.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/containers/image/v5/docker/reference"
16-
"github.com/containers/image/v5/pkg/blobinfocache/none"
17-
"github.com/containers/image/v5/types"
1815
ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1"
16+
"go.podman.io/image/v5/docker/reference"
17+
"go.podman.io/image/v5/pkg/blobinfocache/none"
18+
"go.podman.io/image/v5/types"
1919
"helm.sh/helm/v3/pkg/chart"
2020
"helm.sh/helm/v3/pkg/chart/loader"
2121
"helm.sh/helm/v3/pkg/registry"

‎internal/shared/util/image/helm_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import (
1616
"time"
1717

1818
"github.com/containerd/containerd/archive"
19-
"github.com/containers/image/v5/docker"
20-
"github.com/containers/image/v5/docker/reference"
21-
"github.com/containers/image/v5/image"
22-
"github.com/containers/image/v5/types"
2319
goregistry "github.com/google/go-containerregistry/pkg/registry"
2420
"github.com/opencontainers/go-digest"
2521
ocispecv1 "github.com/opencontainers/image-spec/specs-go/v1"
2622
"github.com/stretchr/testify/assert"
2723
"github.com/stretchr/testify/require"
24+
"go.podman.io/image/v5/docker"
25+
"go.podman.io/image/v5/docker/reference"
26+
"go.podman.io/image/v5/image"
27+
"go.podman.io/image/v5/types"
2828
"helm.sh/helm/v3/pkg/chart"
2929
"helm.sh/helm/v3/pkg/registry"
3030

0 commit comments

Comments
 (0)