Skip to content

Commit dc8c2a3

Browse files
committed
UPSTREAM: <carry>: Clean up replaces in go.mod
Signed-off-by: dtfranz <[email protected]>
1 parent 71bf96f commit dc8c2a3

File tree

172 files changed

+11947
-5338
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+11947
-5338
lines changed

go.mod

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ require (
3333
sigs.k8s.io/controller-tools v0.8.0
3434
)
3535

36-
replace google.golang.org/grpc => google.golang.org/grpc v1.40.0
37-
3836
require (
3937
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
4038
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
@@ -256,9 +254,6 @@ require (
256254
)
257255

258256
replace (
259-
// latest tag resolves to a very old version. this is only used for spinning up local test registries
260-
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
261-
262257
// controller runtime
263258
github.com/openshift/api => github.com/openshift/api v0.0.0-20210517065120-b325f58df679
264259
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
@@ -268,9 +263,6 @@ replace (
268263
github.com/operator-framework/operator-lifecycle-manager => ./staging/operator-lifecycle-manager
269264
github.com/operator-framework/operator-registry => ./staging/operator-registry
270265

271-
// this should be removeable once https://issues.redhat.com/browse/CLOUDBLD-11068 is resolved
272-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
273-
274266
// pinned because no tag supports 1.18 yet
275267
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
276268
)

go.sum

Lines changed: 46 additions & 52 deletions
Large diffs are not rendered by default.

vendor/github.com/docker/distribution/.dockerignore

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/.golangci.yml

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/.gometalinter.json

Lines changed: 0 additions & 16 deletions
This file was deleted.

vendor/github.com/docker/distribution/.mailmap

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/.travis.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

vendor/github.com/docker/distribution/Dockerfile

Lines changed: 48 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/Makefile

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/README.md

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/blobs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/docker-bake.hcl

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/metrics/prometheus.go

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/reference/reference.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/docker/distribution/registry/api/errcode/handler.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)