From db6a4d7ce11b1758327e119590bae7e538f9016f Mon Sep 17 00:00:00 2001
From: Tomer Zait <realgam3@gmail.com>
Date: Sun, 18 Feb 2024 10:50:15 +0200
Subject: [PATCH] fix issues #1829, #1830

---
 pkg/loader/compose/compose.go            |  2 +-
 pkg/loader/compose/utils.go              | 15 ---------------
 pkg/transformer/kubernetes/k8sutils.go   |  6 +-----
 pkg/transformer/kubernetes/kubernetes.go |  5 +++--
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/pkg/loader/compose/compose.go b/pkg/loader/compose/compose.go
index db74942a..5d6ce977 100644
--- a/pkg/loader/compose/compose.go
+++ b/pkg/loader/compose/compose.go
@@ -152,7 +152,7 @@ func checkUnsupportedKey(composeProject *types.Project) []string {
 // LoadFile loads a compose file into KomposeObject
 func (c *Compose) LoadFile(files []string, profiles []string) (kobject.KomposeObject, error) {
 	// Gather the working directory
-	workingDir, err := getComposeFileDir(files)
+	workingDir, err := transformer.GetComposeFileDir(files)
 	if err != nil {
 		return kobject.KomposeObject{}, err
 	}
diff --git a/pkg/loader/compose/utils.go b/pkg/loader/compose/utils.go
index d4409ba9..a101458c 100644
--- a/pkg/loader/compose/utils.go
+++ b/pkg/loader/compose/utils.go
@@ -19,7 +19,6 @@ package compose
 import (
 	"io"
 	"os"
-	"path/filepath"
 	"regexp"
 	"strings"
 
@@ -133,20 +132,6 @@ func loadEnvVars(envars []string) []kobject.EnvVar {
 	return envs
 }
 
-// getComposeFileDir returns compose file directory
-// Assume all the docker-compose files are in the same directory
-func getComposeFileDir(inputFiles []string) (string, error) {
-	inputFile := inputFiles[0]
-	if strings.Index(inputFile, "/") != 0 {
-		workDir, err := os.Getwd()
-		if err != nil {
-			return "", errors.Wrap(err, "Unable to retrieve compose file directory")
-		}
-		inputFile = filepath.Join(workDir, inputFile)
-	}
-	return filepath.Dir(inputFile), nil
-}
-
 func handleServiceType(ServiceType string) (string, error) {
 	switch strings.ToLower(ServiceType) {
 	case "", "clusterip":
diff --git a/pkg/transformer/kubernetes/k8sutils.go b/pkg/transformer/kubernetes/k8sutils.go
index ab1231a9..e85fa3a7 100644
--- a/pkg/transformer/kubernetes/k8sutils.go
+++ b/pkg/transformer/kubernetes/k8sutils.go
@@ -965,9 +965,5 @@ func GetContainerArgs(service kobject.ServiceConfig) []string {
 // The function does not format the file name further, as it may contain periods or other valid characters.
 // Returns the extracted file name.
 func GetFileName(fileName string) string {
-	if strings.Contains(fileName, "/") {
-		fileName = fileName[strings.LastIndex(fileName, "/")+1:]
-	}
-	// Not format filename because can begin with .fileName
-	return fileName
+	return filepath.Base(fileName)
 }
diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go
index 397ee1ea..18acc822 100644
--- a/pkg/transformer/kubernetes/kubernetes.go
+++ b/pkg/transformer/kubernetes/kubernetes.go
@@ -319,9 +319,10 @@ func initConfigMapData(configMap *api.ConfigMap, data map[string]string) {
 	binData := map[string][]byte{}
 
 	for k, v := range data {
-		isText := util.IsText([]byte(v))
+		lfText := strings.Replace(v, "\r\n", "\n", -1)
+		isText := util.IsText([]byte(lfText))
 		if isText {
-			stringData[k] = v
+			stringData[k] = lfText
 		} else {
 			binData[k] = []byte(base64.StdEncoding.EncodeToString([]byte(v)))
 		}