Merge pull request #220 from covexo/fixes

Resolve #108

Author: FabianKramm

cmd/init.go

@@ -153,12 +153,11 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 	createChart := cmd.flags.overwrite
 
 	if !cmd.flags.overwrite {
-		_, dockerfileNotFound := os.Stat(cmd.workdir + "/Dockerfile")
 		_, chartDirNotFound := os.Stat(cmd.workdir + "/chart")
 
-		if dockerfileNotFound == nil || chartDirNotFound == nil {
+		if chartDirNotFound == nil {
 			overwriteAnswer := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-				Question:               "Do you want to overwrite the Dockerfile and the existing files in /chart? (yes | no)",
+				Question:               "Do you want to overwrite the existing files in /chart? (yes | no)",
 				DefaultValue:           "no",
 				ValidationRegexPattern: "^(yes)|(no)$",
 			})

cmd/up.go

@@ -437,7 +437,10 @@ func (cmd *UpCmd) deployChart() {
 	values := map[interface{}]interface{}{}
 	overwriteValues := map[interface{}]interface{}{}
 
-	yamlutil.ReadYamlFromFile(chartPath, values)
+	err := yamlutil.ReadYamlFromFile(chartPath+"values.yaml", values)
+	if err != nil {
+		log.Fatalf("Couldn't deploy chart, error reading from chart values %s: %v", chartPath+"values.yaml", err)
+	}
 
 	containerValues := map[string]interface{}{}
 
@@ -449,14 +452,15 @@ func (cmd *UpCmd) deployChart() {
 			container["command"] = []string{"sleep"}
 			container["args"] = []string{"99999999"}
 		}
+
 		containerValues[imageName] = container
 	}
 
-	pullSecrets := []string{}
+	pullSecrets := []interface{}{}
 	existingPullSecrets, pullSecretsExisting := values["pullSecrets"]
 
 	if pullSecretsExisting {
-		pullSecrets = existingPullSecrets.([]string)
+		pullSecrets = existingPullSecrets.([]interface{})
 	}
 
 	for _, registryConf := range *config.Registries {
@@ -557,7 +561,12 @@ func (cmd *UpCmd) startSync() []*synctool.SyncConfig {
 				labels = append(labels, key+"="+*value)
 			}
 
-			pod, err := kubectl.GetFirstRunningPod(cmd.kubectl, strings.Join(labels, ", "), *config.DevSpace.Release.Namespace)
+			namespace := *config.DevSpace.Release.Namespace
+			if syncPath.Namespace != nil && *syncPath.Namespace != "" {
+				namespace = *syncPath.Namespace
+			}
+
+			pod, err := kubectl.GetFirstRunningPod(cmd.kubectl, strings.Join(labels, ", "), namespace)
 
 			if err != nil {
 				log.Panicf("Unable to list devspace pods: %s", err.Error())
@@ -608,7 +617,12 @@ func (cmd *UpCmd) startPortForwarding() {
 					labels = append(labels, key+"="+*value)
 				}
 
-				pod, err := kubectl.GetFirstRunningPod(cmd.kubectl, strings.Join(labels, ", "), *config.DevSpace.Release.Namespace)
+				namespace := *config.DevSpace.Release.Namespace
+				if portForwarding.Namespace != nil && *portForwarding.Namespace != "" {
+					namespace = *portForwarding.Namespace
+				}
+
+				pod, err := kubectl.GetFirstRunningPod(cmd.kubectl, strings.Join(labels, ", "), namespace)
 
 				if err != nil {
 					log.Errorf("Unable to list devspace pods: %s", err.Error())

pkg/util/yamlutil/yaml.go

@@ -20,9 +20,9 @@ func WriteYamlToFile(yamlData interface{}, filePath string) error {
 //ReadYamlFromFile reads a yaml file
 func ReadYamlFromFile(filePath string, yamlTarget interface{}) error {
 	yamlFile, err := ioutil.ReadFile(filePath)
-
 	if err != nil {
 		return err
 	}
+
 	return yaml.Unmarshal(yamlFile, yamlTarget)
 }