vendor rancher/cri + selinux

Makes this project `make build`-able and with rancher/cri + selinux backport(s).
k3s-io · Jul 27, 2020 · 7da1341 · 7da1341
1 parent ebd1487
commit 7da1341
Show file tree

Hide file tree

Showing 26 changed files with 814 additions and 432 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -52,7 +52,7 @@ google.golang.org/grpc                              v1.23.0
 gotest.tools                                        v2.3.0
 
 # cri dependencies
-github.com/containerd/cri                           f864905c93b97db15503c217dc9a43eb65670b53 # release/1.3 branch
+github.com/containerd/cri                           v1.3.0-k3s.7 https://github.com/rancher/cri.git
 github.com/davecgh/go-spew                          v1.1.1
 github.com/docker/distribution                      0d3efadf0154c2b8a4e7b6621fff9809655cc580
 github.com/docker/docker                            86f080cff0914e9694068ed78d503701667c4c00
@@ -62,7 +62,7 @@ github.com/google/gofuzz                            v1.0.0
 github.com/json-iterator/go                         v1.1.8
 github.com/modern-go/concurrent                     1.0.3
 github.com/modern-go/reflect2                       1.0.1
-github.com/opencontainers/selinux                   5215b1806f52b1fcc2070a8826c542c9d33cd3cf
+github.com/opencontainers/selinux                   bb88c45a3863dc4c38320d71b890bb30ef9feba4
 github.com/seccomp/libseccomp-golang                v0.9.1
 github.com/tchap/go-patricia                        v2.2.6
 golang.org/x/crypto                                 69ecbb4d6d5dab05e49161c6e77ea40a030884e1

diff --git a/vendor/github.com/containerd/cri/pkg/containerd/opts/spec.go b/vendor/github.com/containerd/cri/pkg/containerd/opts/spec.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/container_create.go b/vendor/github.com/containerd/cri/pkg/server/container_create.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/container_remove.go b/vendor/github.com/containerd/cri/pkg/server/container_remove.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/helpers.go b/vendor/github.com/containerd/cri/pkg/server/helpers.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/image_pull.go b/vendor/github.com/containerd/cri/pkg/server/image_pull.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/sandbox_remove.go b/vendor/github.com/containerd/cri/pkg/server/sandbox_remove.go
diff --git a/vendor/github.com/containerd/cri/pkg/server/sandbox_run.go b/vendor/github.com/containerd/cri/pkg/server/sandbox_run.go