kubelet/rkt: Add volumeGetter to rkt.

This enable rkt to fetch the volume mounts by the kubelet.

pkg/kubelet/rkt/rkt_linux.go

@@ -42,7 +42,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/securitycontext"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/volume"
 	appcschema "github.com/appc/spec/schema"
 	appctypes "github.com/appc/spec/schema/types"
 	"github.com/coreos/go-systemd/dbus"
@@ -102,18 +101,25 @@ type runtime struct {
 	recorder            record.EventRecorder
 	prober              prober.Prober
 	readinessManager    *kubecontainer.ReadinessManager
+	volumeGetter        volumeGetter
 }
 
 var _ kubecontainer.Runtime = &runtime{}
 
+// TODO(yifan): Remove this when volumeManager is moved to separate package.
+type volumeGetter interface {
+	GetVolumes(podUID types.UID) (kubecontainer.VolumeMap, bool)
+}
+
 // New creates the rkt container runtime which implements the container runtime interface.
 // It will test if the rkt binary is in the $PATH, and whether we can get the
 // version of it. If so, creates the rkt container runtime, otherwise returns an error.
 func New(config *Config,
 	generator kubecontainer.RunContainerOptionsGenerator,
 	recorder record.EventRecorder,
 	containerRefManager *kubecontainer.RefManager,
-	readinessManager *kubecontainer.ReadinessManager) (kubecontainer.Runtime, error) {
+	readinessManager *kubecontainer.ReadinessManager,
+	volumeGetter volumeGetter) (kubecontainer.Runtime, error) {
 
 	systemdVersion, err := getSystemdVersion()
 	if err != nil {
@@ -353,7 +359,7 @@ func setApp(app *appctypes.App, c *api.Container) error {
 
 // makePodManifest transforms a kubelet pod spec to the rkt pod manifest.
 // TODO(yifan): Use the RunContainerOptions generated by GenerateRunContainerOptions().
-func (r *runtime) makePodManifest(pod *api.Pod, volumeMap map[string]volume.Volume) (*appcschema.PodManifest, error) {
+func (r *runtime) makePodManifest(pod *api.Pod) (*appcschema.PodManifest, error) {
 	manifest := appcschema.BlankPodManifest()
 
 	// Get the image manifests, assume they are already in the cas,
@@ -396,6 +402,11 @@ func (r *runtime) makePodManifest(pod *api.Pod, volumeMap map[string]volume.Volu
 		})
 	}
 
+	volumeMap, ok := r.volumeGetter.GetVolumes(pod.UID)
+	if !ok {
+		return nil, fmt.Errorf("cannot get the volumes for pod %q", kubecontainer.GetPodFullName(pod))
+	}
+
 	// Set global volumes.
 	for name, volume := range volumeMap {
 		volName, err := appctypes.NewACName(name)
@@ -486,11 +497,11 @@ func (r *runtime) apiPodToruntimePod(uuid string, pod *api.Pod) *kubecontainer.P
 // On success, it will return a string that represents name of the unit file
 // and a boolean that indicates if the unit file needs to be reloaded (whether
 // the file is already existed).
-func (r *runtime) preparePod(pod *api.Pod, volumeMap map[string]volume.Volume) (string, bool, error) {
+func (r *runtime) preparePod(pod *api.Pod) (string, bool, error) {
 	cmds := []string{"prepare", "--quiet", "--pod-manifest"}
 
 	// Generate the pod manifest from the pod spec.
-	manifest, err := r.makePodManifest(pod, volumeMap)
+	manifest, err := r.makePodManifest(pod)
 	if err != nil {
 		return "", false, err
 	}
@@ -561,10 +572,10 @@ func (r *runtime) preparePod(pod *api.Pod, volumeMap map[string]volume.Volume) (
 
 // RunPod first creates the unit file for a pod, and then calls
 // StartUnit over d-bus.
-func (r *runtime) RunPod(pod *api.Pod, volumeMap map[string]volume.Volume) error {
+func (r *runtime) RunPod(pod *api.Pod) error {
 	glog.V(4).Infof("Rkt starts to run pod: name %q.", pod.Name)
 
-	name, needReload, err := r.preparePod(pod, volumeMap)
+	name, needReload, err := r.preparePod(pod)
 	if err != nil {
 		return err
 	}
@@ -812,7 +823,7 @@ func (r *runtime) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, podStatus
 	if len(runningPod.Containers) == 0 {
 		glog.V(4).Infof("Pod %q is not running, will start it", podFullName)
 		// TODO(yifan): Use RunContainerOptionsGeneratior to get volumeMaps, etc.
-		return r.RunPod(pod, nil)
+		return r.RunPod(pod)
 	}
 
 	// Add references to all containers.
@@ -869,7 +880,7 @@ func (r *runtime) SyncPod(pod *api.Pod, runningPod kubecontainer.Pod, podStatus
 		if err := r.KillPod(runningPod); err != nil {
 			return err
 		}
-		if err := r.RunPod(pod, nil); err != nil {
+		if err := r.RunPod(pod); err != nil {
 			return err
 		}
 	}

pkg/kubelet/rkt/rkt_unsupported.go

@@ -38,7 +38,8 @@ func New(config *Config,
 	generator kubecontainer.RunContainerOptionsGenerator,
 	recorder record.EventRecorder,
 	containerRefManager *kubecontainer.RefManager,
-	readinessManager *kubecontainer.ReadinessManager) (kubecontainer.Runtime, error) {
+	readinessManager *kubecontainer.ReadinessManager,
+	volumeGetter volumeGetter) (kubecontainer.Runtime, error) {
 	return nil, unsupportedError
 }