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

Respect dab file name when generate helm charts

Browse Source
This commit is contained in:
Janet Kuo 2016-07-22 12:54:22 -07:00
parent b289594c84
commit 23488a29e1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/app/app.go
View File

@ -1061,9 +1061,11 @@ func Convert(c *cli.Context) {
} }
komposeObject := KomposeObject{} komposeObject := KomposeObject{}
file := inputFile
if len(dabFile) > 0 { if len(dabFile) > 0 {
komposeObject = loadBundlesFile(dabFile) komposeObject = loadBundlesFile(dabFile)
file = dabFile
} else { } else {
komposeObject = loadComposeFile(inputFile, c) komposeObject = loadComposeFile(inputFile, c)
} }
@ -1079,7 +1081,7 @@ func Convert(c *cli.Context) {
createChart: createChart, createChart: createChart,
generateYaml: generateYaml, generateYaml: generateYaml,
replicas: replicas, replicas: replicas,
inputFile: inputFile, inputFile: file,
outFile: outFile, outFile: outFile,
f: f, f: f,
} }

5
cli/app/k8sutils.go
View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"strings" "path/filepath"
"text/template" "text/template"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
@ -37,7 +37,8 @@ func generateHelm(filename string, svcnames []string, generateYaml, createD, cre
Name string Name string
} }
dirName := strings.Replace(filename, ".yml", "", 1) extension := filepath.Ext(filename)
dirName := filename[0 : len(filename)-len(extension)]
details := ChartDetails{dirName} details := ChartDetails{dirName}
manifestDir := dirName + string(os.PathSeparator) + "templates" manifestDir := dirName + string(os.PathSeparator) + "templates"
dir, err := os.Open(dirName) dir, err := os.Open(dirName)