diff --git a/pkg/loader/compose/v1v2.go b/pkg/loader/compose/v1v2.go index 055ddeea..9a358641 100644 --- a/pkg/loader/compose/v1v2.go +++ b/pkg/loader/compose/v1v2.go @@ -224,7 +224,7 @@ func libComposeToKomposeMapping(composeObject *project.Project) (kobject.Kompose if composeServiceConfig.Volumes != nil { for _, volume := range composeServiceConfig.Volumes.Volumes { - v := normalizeVolumes(volume.String()) + v := volume.String() serviceConfig.VolList = append(serviceConfig.VolList, v) } } @@ -416,11 +416,13 @@ func ParseVols(volNames []string, svcName string) ([]kobject.Volumes, error) { if err != nil { return nil, errors.Wrapf(err, "could not parse volume %q: %v", vn, err) } + v.VolumeName = normalizeVolumes(v.VolumeName) v.SvcName = svcName v.MountPath = fmt.Sprintf("%s:%s", v.Host, v.Container) v.PVCName = fmt.Sprintf("%s-claim%d", v.SvcName, i) volumes = append(volumes, v) } + return volumes, nil } diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index 4f5a9b86..c38650a9 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -208,13 +208,13 @@ convert::expect_success "$cmd" "/tmp/output-os.json" # Tests related to docker-compose file in /script/test/fixtures/volume-mounts/hostpath # kubernetes test cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml convert --stdout -j --volumes hostPath" -hostpath=$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/data +hostpath=$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/data_sux sed -e "s;%VERSION%;$version;g" -e "s;%CMD%;$cmd;g" -e "s;%HOSTPATH%;$hostpath;g" $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json > /tmp/output-k8s.json convert::expect_success "$cmd" "/tmp/output-k8s.json" # openshift test cmd="kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml convert --stdout -j --volumes hostPath" -hostpath=$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/data +hostpath=$KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/data_sux sed -e "s;%VERSION%;$version;g" -e "s;%CMD%;$cmd;g" -e "s;%HOSTPATH%;$hostpath;g" $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/output-os-template.json > /tmp/output-os.json convert::expect_success "$cmd" "/tmp/output-os.json" diff --git a/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml b/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml index d626ca92..f4efa595 100644 --- a/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml +++ b/script/test/fixtures/volume-mounts/hostpath/docker-compose.yml @@ -5,4 +5,4 @@ services: ports: - "5432" volumes: - - ./data:/var/lib/postgresql/data \ No newline at end of file + - ./data_sux:/var/lib/postgresql/data_sux \ No newline at end of file diff --git a/script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json b/script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json index 19522294..88ba35cd 100644 --- a/script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json +++ b/script/test/fixtures/volume-mounts/hostpath/output-k8s-template.json @@ -82,7 +82,7 @@ "resources": {}, "volumeMounts": [ { - "mountPath": "/var/lib/postgresql/data", + "mountPath": "/var/lib/postgresql/data_sux", "name": "db-hostpath0" } ] diff --git a/script/test/fixtures/volume-mounts/hostpath/output-os-template.json b/script/test/fixtures/volume-mounts/hostpath/output-os-template.json index 2dc25c87..d95f1cee 100644 --- a/script/test/fixtures/volume-mounts/hostpath/output-os-template.json +++ b/script/test/fixtures/volume-mounts/hostpath/output-os-template.json @@ -104,7 +104,7 @@ "volumeMounts": [ { "name": "db-hostpath0", - "mountPath": "/var/lib/postgresql/data" + "mountPath": "/var/lib/postgresql/data_sux" } ] }