kubernetes/pkg/kubelet/rkt
Kubernetes Submit Queue ff1a92fa03 Merge pull request #32410 from euank/revert-rktshim-image-service
Automatic merge from submit-queue

Revert "Merge pull request #30513 from tmrts/kubelet-rkt-cri/use-imag…

This reverts commit aff7dfcaab, reversing
changes made to 7a4d81ea43.

See https://github.com/kubernetes/kubernetes/pull/30513#issuecomment-245949664, this breaks tests for the rkt runtime.

The original PR also changed the source of image truth from the api-service to cli, which could have further implications which @yifan-gu could speak better to, so I think it's safer to just revert for now and discuss further in the rktlet repo / pr. The reverted code effectively already exists (with the bug in question already fixed) here https://github.com/kubernetes-incubator/rktlet/pull/5 .. once that's merged, we can vendor and call it over here in place of #30513.

@yifan-gu / @tmrts  if you think continuing with the changes and rolling forwards (just adding the `--full` flag to list to fix the immediate bug) is better, feel free to close this and open a PR with that change, but I think this approach is overall better for the reasons in the previous paragraph.

cc @tmrts @yifan-gu @kubernetes/sig-rktnetes @pskrzyns
2016-09-12 22:26:34 -07:00
..
mock_os Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
cap.go Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
config.go rkt: Override the config using the response from rkt api service. 2016-08-23 11:42:20 -07:00
container_id.go Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
doc.go Use Go canonical import paths 2016-07-16 13:48:21 -04:00
fake_rkt_interface_test.go Set extra supplemental groups for rkt 2016-07-22 17:43:24 -04:00
image.go Revert "Merge pull request #30513 from tmrts/kubelet-rkt-cri/use-image-service" 2016-09-09 13:35:22 -07:00
log.go Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
rkt_test.go Revert "Merge pull request #30513 from tmrts/kubelet-rkt-cri/use-image-service" 2016-09-09 13:35:22 -07:00
rkt.go Merge pull request #32410 from euank/revert-rktshim-image-service 2016-09-12 22:26:34 -07:00
systemd.go Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
version.go rkt: Remove recommended rkt version 2016-09-02 15:52:37 -07:00