Merge pull request #121 from kinvolk/iaguis/update-vendoring

vendor: update vendoring
kubernetes-retired · Sep 21, 2017 · 3d33d9b · 3d33d9b
2 parents cf22cdd + f6e0c4e
commit 3d33d9b
Show file tree

Hide file tree

Showing 16,954 changed files with 2,113,838 additions and 991,942 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: go
 sudo: required
 dist: trusty
 go:
-    - 1.7
+    - 1.8
 env:
   - GOPKG_PARENT=$HOME/gopath/src/github.com/kubernetes-incubator GOPKG_PATH=$GOPKG_PARENT/rktlet
 

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This repository contains all design documents and code for the project.
 
 Please note that the current (non-CRI) integration of rkt into Kubernetes lives in the kubelet package, not here.
 
-[rkt]: https://github.com/coreos/rkt
+[rkt]: https://github.com/rkt/rkt
 [k8s-cri]: http://blog.kubernetes.io/2016/12/container-runtime-interface-cri-in-kubernetes.html
 [rkt-cncf]: https://www.cncf.io/announcement/2017/03/29/cloud-native-computing-foundation-becomes-home-pod-native-container-engine-project-rkt/
 

diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -27,9 +27,9 @@ import (
 	"github.com/kubernetes-incubator/rktlet/rktlet"
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
-	runtimeapi "k8s.io/kubernetes/pkg/kubelet/api/v1alpha1/runtime"
-	"k8s.io/kubernetes/pkg/util/flag"
+	runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 	"k8s.io/kubernetes/pkg/util/logs"
+	"k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/util/flag"
 )
 
 const defaultUnixSock = "/var/run/rktlet.sock"