From 61ff9eeeaaf67d90ef2d9ad9fcc9e6c8398d87c3 Mon Sep 17 00:00:00 2001
From: Hang Yan <hangyan@alauda.io>
Date: Fri, 9 Mar 2018 00:13:10 +0800
Subject: [PATCH] Add support for compose v3.2

---
 pkg/loader/compose/compose.go            |  2 +-
 pkg/transformer/kubernetes/kubernetes.go | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go
index f868aec7..e019c110 100644
--- a/pkg/loader/compose/compose.go
+++ b/pkg/loader/compose/compose.go
@@ -182,7 +182,7 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
 		}
 		return komposeObject, nil
 	// Use docker/cli for 3
-	case "3", "3.0":
+	case "3", "3.0", "3.1", "3.2":
 		komposeObject, err := parseV3(files)
 		if err != nil {
 			return kobject.KomposeObject{}, err
diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
index c74954eb..2eb17ad6 100644
--- a/pkg/transformer/kubernetes/kubernetes.go
+++ b/pkg/transformer/kubernetes/kubernetes.go
@@ -167,10 +167,10 @@ func (k *Kubernetes) InitConfigMap(name string, service kobject.ServiceConfig, o
 	}
 
 	// Remove root pathing
-	// replace all other slashes / preiods
+	// replace all other slashes / periods
 	envName := FormatEnvName(envFile)
 
-	// In order to differentiate files, we append to the name and remove '.env' if applicate from the file name
+	// In order to differentiate files, we append to the name and remove '.env' if applicable from the file name
 	configMap := &api.ConfigMap{
 		TypeMeta: unversioned.TypeMeta{
 			Kind:       "ConfigMap",
@@ -279,7 +279,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
 
 // CreatePVC initializes PersistentVolumeClaim
 func (k *Kubernetes) CreatePVC(name string, mode string, size string) (*api.PersistentVolumeClaim, error) {
-	volsize, err := resource.ParseQuantity(size)
+	volSize, err := resource.ParseQuantity(size)
 	if err != nil {
 		return nil, errors.Wrap(err, "resource.ParseQuantity failed, Error parsing size")
 	}
@@ -296,7 +296,7 @@ func (k *Kubernetes) CreatePVC(name string, mode string, size string) (*api.Pers
 		Spec: api.PersistentVolumeClaimSpec{
 			Resources: api.ResourceRequirements{
 				Requests: api.ResourceList{
-					api.ResourceStorage: volsize,
+					api.ResourceStorage: volSize,
 				},
 			},
 		},
@@ -437,7 +437,7 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
 	}
 
 	var count int
-	//interating over array of `Vols` struct as it contains all necessary information about volumes
+	//iterating over array of `Vols` struct as it contains all necessary information about volumes
 	for _, volume := range service.Volumes {
 
 		// check if ro/rw mode is defined, default rw
@@ -453,12 +453,12 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
 		} else {
 			volumeName = volume.VolumeName
 		}
-		volmount := api.VolumeMount{
+		volMount := api.VolumeMount{
 			Name:      volumeName,
 			ReadOnly:  readonly,
 			MountPath: volume.Container,
 		}
-		volumeMounts = append(volumeMounts, volmount)
+		volumeMounts = append(volumeMounts, volMount)
 		// Get a volume source based on the type of volume we are using
 		// For PVC we will also create a PVC object and add to list
 		var volsource *api.VolumeSource