Skip to content

NO-JIRA: Internalize removed schema1 manifest type into library-go #2068

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: Internalize removed schema1 manifest type into library-go #2068

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: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/blang/semver/v4 v4.0.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
github.com/distribution/distribution/v3 v3.0.0-20230511163743-f7717b7855ca
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
github.com/fvbommel/sortorder v1.1.0
github.com/go-ldap/ldap/v3 v3.4.11
github.com/gonum/graph v0.0.0-20170401004347-50b27dea7ebb
Expand Down Expand Up @@ -62,7 +63,6 @@ require (
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
github.com/docker/go-metrics v0.0.1 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/felixge/fgprof v0.9.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
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 pkg/image/distribution/manifest/schema1/doc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Package schema1 is a copy from "github.com/distribution/distribution/v3/manifest/schema1"
// This manifest type has been directly removed from distribution/distribution repository.
// However, we still observe some old images that are in this manifest type. At some point, it should be safe
// to entirely remove this schema from here as well.
package schema1
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 pkg/image/registryclient/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"k8s.io/klog/v2"

"github.com/distribution/distribution/v3"
"github.com/distribution/distribution/v3/manifest/schema1"
"github.com/distribution/distribution/v3/reference"
"github.com/distribution/distribution/v3/registry/api/errcode"
registryclient "github.com/distribution/distribution/v3/registry/client"
Expand All @@ -27,6 +26,7 @@ import (
"github.com/distribution/distribution/v3/registry/client/transport"
"github.com/opencontainers/go-digest"

"github.com/openshift/library-go/pkg/image/distribution/manifest/schema1"
imagereference "github.com/openshift/library-go/pkg/image/reference"
)

Expand Down
1 change: 0 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ github.com/distribution/distribution/v3
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/schema1
github.com/distribution/distribution/v3/manifest/schema2
github.com/distribution/distribution/v3/metrics
github.com/distribution/distribution/v3/reference
Expand Down