diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go index 23035445..934f1dae 100644 --- a/pkg/transformer/kubernetes/k8sutils.go +++ b/pkg/transformer/kubernetes/k8sutils.go @@ -621,15 +621,9 @@ func GetEnvsFromFile(file string, opt kobject.ConvertOptions) (map[string]string return envLoad, nil } -// GetContentFromFile get content from file +// GetContentFromFile gets the content from the file.. func GetContentFromFile(file string, opt kobject.ConvertOptions) (string, error) { - // Get the correct file context / directory - composeDir, err := transformer.GetComposeFileDir(opt.InputFiles) - if err != nil { - return "", errors.Wrap(err, "Unable to load file context") - } - fileLocation := path.Join(composeDir, file) - fileBytes, err := ioutil.ReadFile(fileLocation) + fileBytes, err := ioutil.ReadFile(file) if err != nil { return "", errors.Wrap(err, "Unable to read file") } @@ -646,9 +640,13 @@ func FormatEnvName(name string) string { // FormatFileName format file name func FormatFileName(name string) string { - envName := strings.Trim(name, "./") - envName = strings.Replace(envName, "_", "-", -1) - return envName + // Split the filepath name so that we use the + // file name (after the base) for ConfigMap, + // it shouldn't matter whether it has special characters or not + _, file := path.Split(name) + + // Make it DNS-1123 compliant for Kubernetes + return strings.Replace(file, "_", "-", -1) } //FormatContainerName format Container name diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 8792b745..e5f2d845 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -259,6 +259,7 @@ func (k *Kubernetes) InitConfigMapFromFile(name string, service kobject.ServiceC } originFileName := FormatFileName(fileName) + dataMap := make(map[string]string) dataMap[originFileName] = content configMapName := "" diff --git a/script/test/cmd/tests.sh b/script/test/cmd/tests.sh index f13201fb..d4dcf45b 100755 --- a/script/test/cmd/tests.sh +++ b/script/test/cmd/tests.sh @@ -844,10 +844,9 @@ convert::expect_success "$cmd" "/tmp/output-os.json" cmd="kompose convert --stdout -j -f -" sed -e "s;%VERSION%;$version;g" -e "s;%CMD%;$cmd;g" $KOMPOSE_ROOT/script/test/fixtures/stdin/output-k8s.json > /tmp/output-k8s.json cat $KOMPOSE_ROOT/script/test/fixtures/stdin/docker-compose.yaml | $cmd | diff /tmp/output-k8s.json - -EXIT_STATUS=$? echo -e "\n" go test -v github.com/kubernetes/kompose/script/test/cmd rm /tmp/output-k8s.json /tmp/output-os.json -exit $EXIT_STATUS \ No newline at end of file +exit $EXIT_STATUS