Skip to content

NO-JIRA: Use internalized schema1 from library-go #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ardaguclu wants to merge 1 commit into from
Closed

NO-JIRA: Use internalized schema1 from library-go #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,5 @@ require (
)

replace github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b

replace github.com/openshift/library-go => github.com/ardaguclu/library-go v0.0.0-20260105062500-eae954421cad
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ github.com/alicebob/sqlittle v1.4.0 h1:vgYt0nAjhdf/hg52MjKJ84g/uTzBPfrvI+VUBrIgh
github.com/alicebob/sqlittle v1.4.0/go.mod h1:Co1L1qxHqCwf41puWhk2HOodojR0mcsAV4BIt8byZh8=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/ardaguclu/library-go v0.0.0-20260105062500-eae954421cad h1:frSoo3VL142NOtAY1ohjIiTnElK2gX2Az5WETbjgZJc=
github.com/ardaguclu/library-go v0.0.0-20260105062500-eae954421cad/go.mod h1:+fzLay07SiZuTyZhg0pPICqdcN4jvJWU95XOE9r+2Rg=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
Expand Down Expand Up @@ -388,8 +390,6 @@ github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235 h1:9JBeIXmnHlp
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235/go.mod h1:L49W6pfrZkfOE5iC1PqEkuLkXG4W0BX4w8b+L2Bv7fM=
github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b h1:it0YPE/evO6/m8t8wxis9KFI2F/aleOKsI6d9uz0cEk=
github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b/go.mod h1:tNrEB5k8SI+g5kOlsCmL2ELASfpqEofI0+FLBgBdN08=
github.com/openshift/library-go v0.0.0-20251222131241-289839b3ffe8 h1:TWqbSjaYbZGgB6EmnEN6Hc8lQYYCgju2qORBX7Ix1LI=
github.com/openshift/library-go v0.0.0-20251222131241-289839b3ffe8/go.mod h1:nIzWQQE49XbiKizVnVOip9CEB7HJ0hoJwNi3g3YKnKc=
github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
Expand Down
3 changes: 2 additions & 1 deletion pkg/cli/image/manifest/manifest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
Expand All @@ -27,9 +26,11 @@ import (
"k8s.io/klog/v2"

imagespecv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/openshift/library-go/pkg/image/distribution/manifest/schema1"
"github.com/openshift/library-go/pkg/image/dockerv1client"
imagereference "github.com/openshift/library-go/pkg/image/reference"
"github.com/openshift/library-go/pkg/image/registryclient"

"github.com/openshift/oc/pkg/cli/image/manifest/dockercredentials"
"github.com/openshift/oc/pkg/helpers/image/dockerlayer/add"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/cli/image/mirror/mirror.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest/manifestlist"
"github.com/distribution/distribution/v3/manifest/ocischema"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/client"
Expand All @@ -28,7 +27,9 @@ import (
kcmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/templates"

"github.com/openshift/library-go/pkg/image/distribution/manifest/schema1"
"github.com/openshift/library-go/pkg/image/registryclient"

"github.com/openshift/oc/pkg/cli/image/imagesource"
imagemanifest "github.com/openshift/oc/pkg/cli/image/manifest"
"github.com/openshift/oc/pkg/cli/image/workqueue"
Expand Down
2 changes: 1 addition & 1 deletion pkg/helpers/image/test/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"fmt"
"time"

"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/manifest/schema2"
imagespecv1 "github.com/opencontainers/image-spec/specs-go/v1"

Expand All @@ -19,6 +18,7 @@ import (
buildv1 "github.com/openshift/api/build/v1"
dockerv10 "github.com/openshift/api/image/docker10"
imagev1 "github.com/openshift/api/image/v1"
"github.com/openshift/library-go/pkg/image/distribution/manifest/schema1"
)

const (
Expand Down
0 ...ion/v3/manifest/schema1/config_builder.go → ...bution/manifest/schema1/config_builder.go
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions vendor/github.com/openshift/library-go/pkg/image/distribution/manifest/schema1/doc.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tribution/v3/manifest/schema1/manifest.go → ...distribution/manifest/schema1/manifest.go
View file
Open in desktop
File renamed without changes.
0 .../v3/manifest/schema1/reference_builder.go → ...ion/manifest/schema1/reference_builder.go
View file
Open in desktop
File renamed without changes.
0 .../distribution/v3/manifest/schema1/sign.go → ...age/distribution/manifest/schema1/sign.go
View file
Open in desktop
File renamed without changes.
0 ...istribution/v3/manifest/schema1/verify.go → ...e/distribution/manifest/schema1/verify.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/library-go/pkg/image/registryclient/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,6 @@ github.com/distribution/distribution/v3/context
github.com/distribution/distribution/v3/manifest
github.com/distribution/distribution/v3/manifest/manifestlist
github.com/distribution/distribution/v3/manifest/ocischema
github.com/distribution/distribution/v3/manifest/schema1
github.com/distribution/distribution/v3/manifest/schema2
github.com/distribution/distribution/v3/metrics
github.com/distribution/distribution/v3/reference
Expand Down Expand Up @@ -861,7 +860,7 @@ github.com/openshift/client-go/user/clientset/versioned/fake
github.com/openshift/client-go/user/clientset/versioned/scheme
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1
github.com/openshift/client-go/user/clientset/versioned/typed/user/v1/fake
# github.com/openshift/library-go v0.0.0-20251222131241-289839b3ffe8
# github.com/openshift/library-go v0.0.0-20251222131241-289839b3ffe8 => github.com/ardaguclu/library-go v0.0.0-20260105062500-eae954421cad
## explicit; go 1.24.0
github.com/openshift/library-go/pkg/apiserver/jsonpatch
github.com/openshift/library-go/pkg/apps/appsserialization
Expand All @@ -881,6 +880,7 @@ github.com/openshift/library-go/pkg/controller/factory
github.com/openshift/library-go/pkg/crypto
github.com/openshift/library-go/pkg/features
github.com/openshift/library-go/pkg/git
github.com/openshift/library-go/pkg/image/distribution/manifest/schema1
github.com/openshift/library-go/pkg/image/dockerv1client
github.com/openshift/library-go/pkg/image/imageutil
github.com/openshift/library-go/pkg/image/internal/digest
Expand Down Expand Up @@ -1951,3 +1951,4 @@ sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v3
sigs.k8s.io/yaml/kyaml
# github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
# github.com/openshift/library-go => github.com/ardaguclu/library-go v0.0.0-20260105062500-eae954421cad