deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Add support for compose v3.2

Browse Source
This commit is contained in:
Hang Yan 2018-03-09 00:13:10 +08:00
parent 6bdaeafe2a
commit 61ff9eeeaa
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/loader/compose/compose.go
View File

@ -182,7 +182,7 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
} }
return komposeObject, nil return komposeObject, nil
// Use docker/cli for 3 // Use docker/cli for 3
case "3", "3.0": case "3", "3.0", "3.1", "3.2":
komposeObject, err := parseV3(files) komposeObject, err := parseV3(files)
if err != nil { if err != nil {
return kobject.KomposeObject{}, err return kobject.KomposeObject{}, err

14
pkg/transformer/kubernetes/kubernetes.go
View File

@ -167,10 +167,10 @@ func (k *Kubernetes) InitConfigMap(name string, service kobject.ServiceConfig, o
} }
// Remove root pathing // Remove root pathing
// replace all other slashes / preiods // replace all other slashes / periods
envName := FormatEnvName(envFile) 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{ configMap := &api.ConfigMap{
TypeMeta: unversioned.TypeMeta{ TypeMeta: unversioned.TypeMeta{
Kind: "ConfigMap", Kind: "ConfigMap",
@ -279,7 +279,7 @@ func (k *Kubernetes) initIngress(name string, service kobject.ServiceConfig, por
// CreatePVC initializes PersistentVolumeClaim // CreatePVC initializes PersistentVolumeClaim
func (k *Kubernetes) CreatePVC(name string, mode string, size string) (*api.PersistentVolumeClaim, error) { 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 { if err != nil {
return nil, errors.Wrap(err, "resource.ParseQuantity failed, Error parsing size") 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{ Spec: api.PersistentVolumeClaimSpec{
Resources: api.ResourceRequirements{ Resources: api.ResourceRequirements{
Requests: api.ResourceList{ 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 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 { for _, volume := range service.Volumes {
// check if ro/rw mode is defined, default rw // check if ro/rw mode is defined, default rw
@ -453,12 +453,12 @@ func (k *Kubernetes) ConfigVolumes(name string, service kobject.ServiceConfig) (
} else { } else {
volumeName = volume.VolumeName volumeName = volume.VolumeName
} }
volmount := api.VolumeMount{ volMount := api.VolumeMount{
Name: volumeName, Name: volumeName,
ReadOnly: readonly, ReadOnly: readonly,
MountPath: volume.Container, MountPath: volume.Container,
} }
volumeMounts = append(volumeMounts, volmount) volumeMounts = append(volumeMounts, volMount)
// Get a volume source based on the type of volume we are using // 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 // For PVC we will also create a PVC object and add to list
var volsource *api.VolumeSource var volsource *api.VolumeSource