distribution: remove unused RequireSchema2

thaJeztah · thaJeztah · commit 85fddc008133 · 2022-11-28T20:29:19.000+01:00
It's never set, so we can remove it.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/distribution/config.go b/distribution/config.go
@@ -46,8 +46,6 @@ type Config struct {
 	// ReferenceStore manages tags. This value is optional, when excluded
 	// content will not be tagged.
 	ReferenceStore refstore.Store
-	// RequireSchema2 ensures that only schema2 manifests are used.
-	RequireSchema2 bool
 }
 
 // ImagePullConfig stores pull configuration.
diff --git a/distribution/pull_v2.go b/distribution/pull_v2.go
@@ -438,10 +438,6 @@ func (p *puller) pullTag(ctx context.Context, ref reference.Named, platform *spe
 
 	switch v := manifest.(type) {
 	case *schema1.SignedManifest:
-		if p.config.RequireSchema2 {
-			return false, fmt.Errorf("invalid manifest: not schema2")
-		}
-
 		// give registries time to upgrade to schema2 and only warn if we know a registry has been upgraded long time ago
 		// TODO: condition to be removed
 		if reference.Domain(ref) == "docker.io" {
diff --git a/distribution/push_v2.go b/distribution/push_v2.go
@@ -188,7 +188,7 @@ func (p *pusher) pushTag(ctx context.Context, ref reference.NamedTagged, id dige
 
 	putOptions := []distribution.ManifestServiceOption{distribution.WithTag(ref.Tag())}
 	if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
-		if runtime.GOOS == "windows" || p.config.RequireSchema2 {
+		if runtime.GOOS == "windows" {
 			logrus.Warnf("failed to upload schema2 manifest: %v", err)
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,6 @@ type Config struct {`
`46`	`46`	`// ReferenceStore manages tags. This value is optional, when excluded`
`47`	`47`	`// content will not be tagged.`
`48`	`48`	`ReferenceStore refstore.Store`
`49`		`- // RequireSchema2 ensures that only schema2 manifests are used.`
`50`		`- RequireSchema2 bool`
`51`	`49`	`}`
`52`	`50`
`53`	`51`	`// ImagePullConfig stores pull configuration.`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func (p *pusher) pushTag(ctx context.Context, ref reference.NamedTagged, id dige`
`188`	`188`
`189`	`189`	`putOptions := []distribution.ManifestServiceOption{distribution.WithTag(ref.Tag())}`
`190`	`190`	`if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {`
`191`		`- if runtime.GOOS == "windows" \|\| p.config.RequireSchema2 {`
	`191`	`+ if runtime.GOOS == "windows" {`
`192`	`192`	`logrus.Warnf("failed to upload schema2 manifest: %v", err)`
`193`	`193`	`return err`
`194`	`194`	`}`