Merge pull request #25902 from euank/changeVolumeMounts

Automatic merge from submit-queue

rkt: Use volumes from RunContainerOptions

This replaces the previous creation of mounts from the `volumeGetter`
with mounts provided via RunContainerOptions.

This is motivated by the fact that the latter has a more complete set of
mounts (e.g. the `/etc/hosts` one created in kubelet.go in the case an IP is available).

This does not induce further e2e failures as far as I can tell.

cc @yifan-gu
This commit is contained in:
k8s-merge-robot
2016-05-28 03:58:14 -07:00
4 changed files with 11 additions and 87 deletions

View File

@@ -445,7 +445,6 @@ func NewMainKubelet(
containerRefManager,
klet.podManager,
klet.livenessManager,
klet.volumeManager,
klet.httpClient,
klet.networkPlugin,
klet.hairpinMode == componentconfig.HairpinVeth,