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

Validate flags when generating charts, and prints message for file created

Browse Source
This commit is contained in:
Janet Kuo
2016-07-08 16:13:29 -07:00
parent e5a1d9dd9c
commit 54e5dfae78
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/app/k8sutils.go
+22 -17
View File
@@ -18,6 +18,7 @@ package app
import (
"bytes"
"fmt"
"io/ioutil"
"os"
"strings"
@@ -31,7 +32,7 @@ import (
/**
* Generate Helm Chart configuration
*/
func generateHelm(filename string, svcname string, generateYaml bool) error {
func generateHelm(filename string, svcnames []string, generateYaml bool) error {
type ChartDetails struct {
Name string
}
@@ -90,29 +91,33 @@ home:
/* Copy all related json/yaml files into the newly created manifests directory */
// TODO: support copying controller files other than rc?
// TODO: support copying the file specified by --out?
extension := ".json"
if generateYaml {
extension = ".yaml"
}
infile, err := ioutil.ReadFile(svcname + "-rc" + extension)
if err != nil {
logrus.Infof("Error reading %s: %s\n", svcname+"-rc"+extension, err)
return err
}
for _, svcname := range svcnames {
extension := ".json"
if generateYaml {
extension = ".yaml"
}
infile, err := ioutil.ReadFile(svcname + "-rc" + extension)
if err != nil {
logrus.Infof("Error reading %s: %s\n", svcname+"-rc"+extension, err)
return err
}
err = ioutil.WriteFile(manifestDir+string(os.PathSeparator)+svcname+"-rc"+extension, infile, 0644)
if err != nil {
return err
}
err = ioutil.WriteFile(manifestDir+string(os.PathSeparator)+svcname+"-rc"+extension, infile, 0644)
if err != nil {
return err
}
/* The svc file is optional */
infile, err = ioutil.ReadFile(svcname + "-svc" + extension)
if err == nil {
/* The svc file is optional */
infile, err = ioutil.ReadFile(svcname + "-svc" + extension)
if err != nil {
continue
}
err = ioutil.WriteFile(manifestDir+string(os.PathSeparator)+svcname+"-svc"+extension, infile, 0644)
if err != nil {
return err
}
}
fmt.Fprintf(os.Stdout, "chart created in %q\n", "."+string(os.PathSeparator)+dirName+string(os.PathSeparator))
return nil
}