Vendor Kubernetes v1.15.0-alpha.2

Signed-off-by: Sascha Grunert <sgrunert@suse.com>

cmd/crio/main.go

@@ -27,7 +27,7 @@ import (
 	"github.com/urfave/cli"
 	"golang.org/x/sys/unix"
 	"google.golang.org/grpc"
-	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
+	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
 // gitCommit is the commit that the binary is being built from.

go.mod

@@ -1,22 +1,20 @@
 go 1.12
 
+module github.com/cri-o/cri-o
+
 require (
 	github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 // indirect
 	github.com/BurntSushi/toml v0.3.1
 	github.com/Microsoft/go-winio v0.4.11
 	github.com/Microsoft/hcsshim v0.6.2 // indirect
 	github.com/VividCortex/ewma v1.1.1 // indirect
-	github.com/blang/semver v3.5.0+incompatible // indirect
-	github.com/boltdb/bolt v0.0.0-20180302180052-fd01fc79c553 // indirect
 	github.com/checkpoint-restore/go-criu v0.0.0-20181120144056-17b0214f6c48 // indirect
 	github.com/containerd/cgroups v0.0.0-20180515175038-5e610833b720
-	github.com/containerd/console v0.0.0-20170925154832-84eeaae905fa // indirect
 	github.com/containerd/containerd v1.2.6
 	github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260 // indirect
 	github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3 // indirect
 	github.com/containerd/project v0.0.0-20190306185219-831961d1e0c8
 	github.com/containerd/ttrpc v0.0.0-20180920185216-2a805f718635
-	github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd // indirect
 	github.com/containernetworking/cni v0.7.0-rc2
 	github.com/containernetworking/plugins v0.7.5
 	github.com/containers/buildah v1.7.2
@@ -38,7 +36,6 @@ require (
 	github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
 	github.com/elazarl/goproxy v0.0.0-20190410145444-c548f45dcf1d // indirect
 	github.com/elazarl/goproxy/ext v0.0.0-20190410145444-c548f45dcf1d // indirect
-	github.com/fatih/camelcase v0.0.0-20160318181535-f6a740d52f96 // indirect
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/fsouza/go-dockerclient v1.3.0 // indirect
 	github.com/go-zoo/bone v0.0.0-20170711140942-031b4005dfe2
@@ -56,19 +53,17 @@ require (
 	github.com/klauspost/cpuid v1.2.0 // indirect
 	github.com/klauspost/pgzip v1.2.1 // indirect
 	github.com/kr/pty v1.1.1
-	github.com/lithammer/dedent v1.1.0 // indirect
 	github.com/mattn/go-isatty v0.0.4 // indirect
 	github.com/mattn/go-shellwords v1.0.5 // indirect
 	github.com/mistifyio/go-zfs v2.1.1+incompatible // indirect
-	github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
 	github.com/mrunalp/fileutils v0.0.0-20171103030105-7d4729fb3618 // indirect
 	github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c // indirect
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
 	github.com/opencontainers/go-digest v1.0.0-rc1
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/runc v1.0.0-rc7
-	github.com/opencontainers/runtime-spec v0.1.2-0.20190408193819-a1b50f621a48
+	github.com/opencontainers/runtime-spec v1.0.0
 	github.com/opencontainers/runtime-tools v0.3.1-0.20190418135848-095789df6c2b
 	github.com/opencontainers/selinux v1.2.1
 	github.com/openshift/imagebuilder v0.0.0-20190308124740-705fe9255c57 // indirect
@@ -77,7 +72,6 @@ require (
 	github.com/pkg/errors v0.8.1
 	github.com/prometheus/client_golang v0.9.2
 	github.com/prometheus/common v0.3.0 // indirect
-	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/seccomp/containers-golang v0.0.0-20180629143253-cdfdaa7543f4 // indirect
 	github.com/seccomp/libseccomp-golang v0.9.0
 	github.com/sirupsen/logrus v1.4.1
@@ -98,16 +92,36 @@ require (
 	golang.org/x/sys v0.0.0-20190410235845-0ad05ae3009d
 	golang.org/x/text v0.3.1-0.20190410012825-f4905fbd45b6
 	google.golang.org/grpc v1.20.0
-	k8s.io/api v0.0.0-20190409092523-d687e77c8ae9
-	k8s.io/apiextensions-apiserver v0.0.0-20190409093611-d42ba5c63e88 // indirect
-	k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b
-	k8s.io/client-go v0.0.0-20190409092706-ca8df85b1798
-	k8s.io/cloud-provider v0.0.0-20190409133700-fca63a37790d // indirect
-	k8s.io/kube-openapi v0.0.0-20190306001800-15615b16d372 // indirect
-	k8s.io/kubernetes v1.14.0
-	k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7
+	k8s.io/api v0.0.0
+	k8s.io/apimachinery v0.0.0
+	k8s.io/client-go v0.0.0
+	k8s.io/cri-api v0.0.0
+	k8s.io/kubernetes v0.0.0
+	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 )
 
-replace cloud.google.com/go => cloud.google.com/go v0.34.0
-
-module github.com/cri-o/cri-o
+replace (
+	cloud.google.com/go => cloud.google.com/go v0.34.0
+	github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v0.1.2-0.20190408193819-a1b50f621a48
+	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190429174420-306740f81c3b
+	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190429174420-306740f81c3b
+	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190429174420-306740f81c3b
+	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190429174420-306740f81c3b
+	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190429174420-306740f81c3b
+	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190429174420-306740f81c3b
+	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190429174420-306740f81c3b
+	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190429174420-306740f81c3b
+	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190429174420-306740f81c3b
+	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190429174420-306740f81c3b
+	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190429174420-306740f81c3b
+	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190429174420-306740f81c3b
+	k8s.io/kubernetes => k8s.io/kubernetes v1.15.0-alpha.2
+	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190429174420-306740f81c3b
+	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190429174420-306740f81c3b
+	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190429174420-306740f81c3b
+)