Skip to content

Commit 0121e48

Browse files
openshift-merge-robotopenshift-merge-robot
authoredMay 7, 2020
Merge pull request operator-framework#316 from ecordell/containerd-authorizer
Bug 1830334: fix(auth): manually vendor authorizer
·
v1.12.3
2 parents 5e8da3d + 94090c2 commit 0121e48

35 files changed

+1084
-338
lines changed
 

‎go.mod

+4-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,7 @@ require (
5353
k8s.io/kubectl v0.18.0
5454
)
5555

56-
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
56+
replace (
57+
github.com/containerd/containerd => github.com/ecordell/containerd v1.3.1-0.20200501170002-47240ee83023
58+
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20191216044856-a8371794149d
59+
)

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn
177177
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
178178
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
179179
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
180+
github.com/ecordell/containerd v1.3.1-0.20200501170002-47240ee83023 h1:oATeo2qQaPh75ufeWmPDWRxXfz0pSD6hICADgTvO9BE=
181+
github.com/ecordell/containerd v1.3.1-0.20200501170002-47240ee83023/go.mod h1:bzKmwSHFIW6VylTyruXdGKbiAE3GhZV13uRlfLxy75s=
180182
github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
181183
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e h1:p1yVGRW3nmb85p1Sh1ZJSDm4A4iKLS5QNbvUHMgGu/M=
182184
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=

‎vendor/github.com/containerd/containerd/archive/tar_unix.go

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/content/local/store.go

+32-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/content/local/writer.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/filters/parser.go

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/filters/scanner.go

+32-18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/gc/gc.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/identifiers/validate.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/images/handlers.go

+9-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/log/context.go

-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/metadata/adaptors.go

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/metadata/namespaces.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/metadata/snapshot.go

+209-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/mount/mount_linux.go

+55-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/mount/mountinfo_linux.go

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/namespaces/context.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/namespaces/validate.go

-83
This file was deleted.

‎vendor/github.com/containerd/containerd/platforms/cpuinfo.go

+12-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/platforms/platforms.go

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/reference/reference.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/authorizer.go

+12-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/errcode.go

+283
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/errdesc.go

+154
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/fetcher.go

+20-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/pusher.go

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/remotes/docker/resolver.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/snapshots/snapshotter.go

+54-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/sys/epoll.go

+11-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/sys/filesys.go

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/sys/filesys_windows.go

+45-44
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/sys/mount_linux.go

+39-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/sys/socket_unix.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/version/version.go

+6-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ github.com/bugsnag/bugsnag-go/sessions
5151
github.com/bugsnag/panicwrap
5252
# github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f
5353
github.com/containerd/cgroups/stats/v1
54-
# github.com/containerd/containerd v1.3.2
54+
# github.com/containerd/containerd v1.3.2 => github.com/ecordell/containerd v1.3.1-0.20200501170002-47240ee83023
5555
github.com/containerd/containerd/archive
5656
github.com/containerd/containerd/archive/compression
5757
github.com/containerd/containerd/containers

0 commit comments

Comments
 (0)
Please sign in to comment.