diff --git a/go.mod b/go.mod index bdd20ed954..7c6b073e31 100644 --- a/go.mod +++ b/go.mod @@ -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-cherrypick-robot/docker-distribution/v3 v3.0.0-20250115160812-3c9baa24eada diff --git a/go.sum b/go.sum index bc7fb20292..088b4caa23 100644 --- a/go.sum +++ b/go.sum @@ -226,12 +226,12 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/openshift-cherrypick-robot/docker-distribution/v3 v3.0.0-20250115160812-3c9baa24eada h1:oiiS/ybe9j4YLHmFnn0t0eGyERRZyD4EAGVaqdlMmNU= +github.com/openshift-cherrypick-robot/docker-distribution/v3 v3.0.0-20250115160812-3c9baa24eada/go.mod h1:+fqBJ4vPYo4Uu1ZE4d+bUtTLRXfdSL3NvCZIZ9GHv58= github.com/openshift/api v0.0.0-20240613141850-76a71dac36a0 h1:Kn16YZDBGwetg+pMQ0u0/3aOxRXQJi/1lu6rIlK+1So= 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/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= diff --git a/vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3.go b/vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3.go index 2c36a700d9..69fdd7fc9b 100644 --- a/vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3.go +++ b/vendor/github.com/distribution/distribution/v3/registry/storage/driver/s3-aws/s3.go @@ -557,9 +557,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, }) diff --git a/vendor/modules.txt b/vendor/modules.txt index 486dbb67ff..c1e203d9e2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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-cherrypick-robot/docker-distribution/v3 v3.0.0-20250115160812-3c9baa24eada ## 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-cherrypick-robot/docker-distribution/v3 v3.0.0-20250115160812-3c9baa24eada