forked from LaconicNetwork/kompose
Fix v3 hostpath path concatenate error (#1222)
This commit is contained in:
parent
ae138029a1
commit
25337eb82c
@ -164,9 +164,8 @@ func loadV3Volumes(volumes []types.ServiceVolumeConfig) []string {
|
|||||||
|
|
||||||
var volArray []string
|
var volArray []string
|
||||||
for _, vol := range volumes {
|
for _, vol := range volumes {
|
||||||
|
|
||||||
// There will *always* be Source when parsing
|
// There will *always* be Source when parsing
|
||||||
v := normalizeVolumes(vol.Source)
|
v := vol.Source
|
||||||
|
|
||||||
if vol.Target != "" {
|
if vol.Target != "" {
|
||||||
v = v + ":" + vol.Target
|
v = v + ":" + vol.Target
|
||||||
|
|||||||
@ -907,7 +907,13 @@ func (k *Kubernetes) ConfigHostPathVolumeSource(path string) (*api.VolumeSource,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
absPath := filepath.Join(dir, path)
|
absPath := path
|
||||||
|
if !filepath.IsAbs(path) {
|
||||||
|
absPath = filepath.Join(dir, path)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Debugf("fuck path: %s,%s", path, absPath)
|
||||||
|
|
||||||
return &api.VolumeSource{
|
return &api.VolumeSource{
|
||||||
HostPath: &api.HostPathVolumeSource{Path: absPath},
|
HostPath: &api.HostPathVolumeSource{Path: absPath},
|
||||||
}, nil
|
}, nil
|
||||||
|
|||||||
@ -218,6 +218,20 @@ 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
|
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"
|
convert::expect_success "$cmd" "/tmp/output-os.json"
|
||||||
|
|
||||||
|
cmd="kompose -f $KOMPOSE_ROOT/script/test/fixtures/volume-mounts/hostpath/docker-compose-v3.yml convert --stdout -j --volumes hostPath"
|
||||||
|
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-v3.yml convert --stdout -j --volumes hostPath"
|
||||||
|
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"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
######
|
######
|
||||||
# Tests related to docker-compose file in /script/test/fixtures/volume-mounts/volumes-from
|
# Tests related to docker-compose file in /script/test/fixtures/volume-mounts/volumes-from
|
||||||
# kubernetes test
|
# kubernetes test
|
||||||
|
|||||||
8
script/test/fixtures/volume-mounts/hostpath/docker-compose-v3.yml
vendored
Normal file
8
script/test/fixtures/volume-mounts/hostpath/docker-compose-v3.yml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
version: '3'
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:10.1
|
||||||
|
ports:
|
||||||
|
- "5432"
|
||||||
|
volumes:
|
||||||
|
- ./data_sux:/var/lib/postgresql/data_sux
|
||||||
Loading…
Reference in New Issue
Block a user