Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

vendor: update vendoring #121

Merged
merged 5 commits into from
Sep 21, 2017
Merged

vendor: update vendoring #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09b772e
vendor: update vendoring
iaguis Sep 13, 2017
0551f2d
*: changes for the new CRI API
iaguis Sep 13, 2017
ef20d6f
vendor: coreos/rkt v1.25.0 -> rkt/rkt v1.28.1
iaguis Sep 13, 2017
2791bd0
travis.yml: update to go 1.8
iaguis Sep 13, 2017
f6e0c4e
vendor: remove github.com/coreos/rkt
iaguis Sep 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
4 changes: 2 additions & 2 deletions cmd/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading