Merge pull request #190 from surajssd/support-volumes-from

support for volumes_from docker-compose construct

pkg/kobject/kobject.go

@@ -53,7 +53,6 @@ var unsupportedKey = map[string]int{
 	"ShmSize":       0,
 	"StopSignal":    0,
 	"VolumeDriver":  0,
-	"VolumesFrom":   0,
 	"Uts":           0,
 	"ReadOnly":      0,
 	"StdinOpen":     0,
@@ -150,6 +149,7 @@ type ServiceConfig struct {
 	Privileged    bool
 	Restart       string
 	User          string
+	VolumesFrom   []string
 }
 
 // EnvVar holds the environment variable struct of a container

pkg/loader/compose/compose.go

@@ -219,6 +219,7 @@ func (c *Compose) LoadFile(file string) kobject.KomposeObject {
 			serviceConfig.Privileged = composeServiceConfig.Privileged
 			serviceConfig.Restart = composeServiceConfig.Restart
 			serviceConfig.User = composeServiceConfig.User
+			serviceConfig.VolumesFrom = composeServiceConfig.VolumesFrom
 
 			komposeObject.ServiceConfigs[name] = serviceConfig
 		}

pkg/transformer/kubernetes/k8sutils.go

@@ -333,3 +333,53 @@ func SortServicesFirst(objs *[]runtime.Object) {
 	ret = append(ret, others...)
 	*objs = ret
 }
+
+func findDependentVolumes(svcname string, komposeObject kobject.KomposeObject) (volumes []api.Volume, volumeMounts []api.VolumeMount) {
+	// Get all the volumes and volumemounts this particular service is dependent on
+	for _, dependentSvc := range komposeObject.ServiceConfigs[svcname].VolumesFrom {
+		vols, volMounts := findDependentVolumes(dependentSvc, komposeObject)
+		volumes = append(volumes, vols...)
+		volumeMounts = append(volumeMounts, volMounts...)
+	}
+	// add the volumes info of this service
+	volMounts, vols, _ := ConfigVolumes(svcname, komposeObject.ServiceConfigs[svcname])
+	volumes = append(volumes, vols...)
+	volumeMounts = append(volumeMounts, volMounts...)
+	return
+}
+
+func VolumesFrom(objects *[]runtime.Object, komposeObject kobject.KomposeObject) {
+
+	for _, obj := range *objects {
+		switch t := obj.(type) {
+		case *api.ReplicationController:
+			svcName := t.ObjectMeta.Name
+			for _, dependentSvc := range komposeObject.ServiceConfigs[svcName].VolumesFrom {
+				volumes, volumeMounts := findDependentVolumes(dependentSvc, komposeObject)
+				t.Spec.Template.Spec.Volumes = append(t.Spec.Template.Spec.Volumes, volumes...)
+				t.Spec.Template.Spec.Containers[0].VolumeMounts = append(t.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMounts...)
+			}
+		case *extensions.Deployment:
+			svcName := t.ObjectMeta.Name
+			for _, dependentSvc := range komposeObject.ServiceConfigs[svcName].VolumesFrom {
+				volumes, volumeMounts := findDependentVolumes(dependentSvc, komposeObject)
+				t.Spec.Template.Spec.Volumes = append(t.Spec.Template.Spec.Volumes, volumes...)
+				t.Spec.Template.Spec.Containers[0].VolumeMounts = append(t.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMounts...)
+			}
+		case *extensions.DaemonSet:
+			svcName := t.ObjectMeta.Name
+			for _, dependentSvc := range komposeObject.ServiceConfigs[svcName].VolumesFrom {
+				volumes, volumeMounts := findDependentVolumes(dependentSvc, komposeObject)
+				t.Spec.Template.Spec.Volumes = append(t.Spec.Template.Spec.Volumes, volumes...)
+				t.Spec.Template.Spec.Containers[0].VolumeMounts = append(t.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMounts...)
+			}
+		case *deployapi.DeploymentConfig:
+			svcName := t.ObjectMeta.Name
+			for _, dependentSvc := range komposeObject.ServiceConfigs[svcName].VolumesFrom {
+				volumes, volumeMounts := findDependentVolumes(dependentSvc, komposeObject)
+				t.Spec.Template.Spec.Volumes = append(t.Spec.Template.Spec.Volumes, volumes...)
+				t.Spec.Template.Spec.Containers[0].VolumeMounts = append(t.Spec.Template.Spec.Containers[0].VolumeMounts, volumeMounts...)
+			}
+		}
+	}
+}

pkg/transformer/kubernetes/kubernetes.go

@@ -310,6 +310,8 @@ func (k *Kubernetes) Transform(komposeObject kobject.KomposeObject, opt kobject.
 
 		allobjects = append(allobjects, objects...)
 	}
+	// If docker-compose has a volumes_from directive it will be handled here
+	VolumesFrom(&allobjects, komposeObject)
 	// sort all object so Services are first
 	SortServicesFirst(&allobjects)
 	return allobjects

pkg/transformer/openshift/openshift.go

@@ -160,6 +160,8 @@ func (k *OpenShift) Transform(komposeObject kobject.KomposeObject, opt kobject.C
 
 		allobjects = append(allobjects, objects...)
 	}
+	// If docker-compose has a volumes_from directive it will be handled here
+	kubernetes.VolumesFrom(&allobjects, komposeObject)
 	// sort all object so Services are first
 	kubernetes.SortServicesFirst(&allobjects)
 	return allobjects