openshift/image-registry
1
0
Fork 0
mirror of https://github.com/openshift/image-registry.git synced 2026-02-05 09:45:55 +01:00
Code Issues Releases Activity

OCPBUGS-38874: bump docker-distribution to add new regions

Browse Source 
bumping docker-distribution dependency as the new version includes a few
new regions.

this bump also includes the changes introduced by
https://github.com/openshift/docker-distribution/pull/44.
This commit is contained in:
Ricardo Maraschini
2025-01-20 12:42:11 +01:00
parent 4e5150f56b
commit 1d1342e4f8
4 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -120,4 +120,4 @@ require (
sigs.k8s.io/yaml v1.3.0 // indirect
)
replace github.com/distribution/distribution/v3 => github.com/openshift/docker-distribution/v3 v3.0.0-20241023082416-9b9c54dbc086
replace github.com/distribution/distribution/v3 => github.com/openshift/docker-distribution/v3 v3.0.0-20250120104846-a24972526437

4
go.sum
View File

@@ -230,8 +230,8 @@ github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0 h1:Kn16YZDBGwetg+pMQ
github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEconE+1IKmIgCOof/Len5ceG6H1pk43yv5U=
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8=
github.com/openshift/docker-distribution/v3 v3.0.0-20241023082416-9b9c54dbc086 h1:kM30ruFjxZiMWDYPcqWn3wc2YmDufuhBcBGMrTuCEXc=
github.com/openshift/docker-distribution/v3 v3.0.0-20241023082416-9b9c54dbc086/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58=
github.com/openshift/docker-distribution/v3 v3.0.0-20250120104846-a24972526437 h1:dZYOAoYFvh/VIGMBjo0lcHHA3cPZSUz+tPJbSa+h55E=
github.com/openshift/docker-distribution/v3 v3.0.0-20250120104846-a24972526437/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58=
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1 h1:jLERUXwvYY9+9oCz66oQ/XTZzeyH8RmCpxiImYVYnmA=
github.com/openshift/library-go v0.0.0-20240607134135-aed018c215a1/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I=
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=

20
vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3.go generated vendored
View File

@@ -42,6 +42,17 @@ import (
"github.com/distribution/distribution/v3/registry/storage/driver/factory"
)
// additionalRegions is a slice with regions not listed among the default
// regions supported by aws-sdk-go v1. the v1 of the sdk is in maintenance
// therefore it does not receive new regions as aws infrastructure grows.
var additionalRegions = []string{
"ap-southeast-5", // Asia Pacific (Malaysia)
"ap-southeast-7", // Asia Pacific (Thailand)
"ca-west-1", // Canada West (Calgary)
"il-central-1", // Israel (Tel Aviv)
"mx-central-1", // Mexico (Central)
}
const driverName = "s3aws"
// minChunkSize defines the minimum multipart upload chunk size
@@ -130,6 +141,10 @@ func init() {
}
}
for _, region := range additionalRegions {
validRegions[region] = struct{}{}
}
for _, objectACL := range []string{
s3.ObjectCannedACLPrivate,
s3.ObjectCannedACLPublicRead,
@@ -557,9 +572,8 @@ func New(params DriverParameters) (*Driver, error) {
awsConfig.WithUseDualStack(params.UseDualStack)
if params.SkipVerify {
httpTransport := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
httpTransport := http.DefaultTransport.(*http.Transport).Clone()
httpTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
awsConfig.WithHTTPClient(&http.Client{
Transport: httpTransport,
})

4
vendor/modules.txt vendored
View File

@@ -166,7 +166,7 @@ github.com/davecgh/go-spew/spew
github.com/denverdino/aliyungo/common
github.com/denverdino/aliyungo/oss
github.com/denverdino/aliyungo/util
# github.com/distribution/distribution/v3 v3.0.0+incompatible => github.com/openshift/docker-distribution/v3 v3.0.0-20241023082416-9b9c54dbc086
# github.com/distribution/distribution/v3 v3.0.0+incompatible => github.com/openshift/docker-distribution/v3 v3.0.0-20250120104846-a24972526437
## explicit; go 1.18
github.com/distribution/distribution/v3
github.com/distribution/distribution/v3/configuration
@@ -1081,4 +1081,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# github.com/distribution/distribution/v3 => github.com/openshift/docker-distribution/v3 v3.0.0-20241023082416-9b9c54dbc086
# github.com/distribution/distribution/v3 => github.com/openshift/docker-distribution/v3 v3.0.0-20250120104846-a24972526437