mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-16 06:49:38 +00:00
ff1a92fa03
Automatic merge from submit-queue Revert "Merge pull request #30513 from tmrts/kubelet-rkt-cri/use-imag… This reverts commitaff7dfcaab, reversing changes made to7a4d81ea43. 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