Fix several issues regarding new deployment method

FabianKramm · FabianKramm · commit 37f99922b476 · 2018-10-16T16:52:56.000+02:00
diff --git a/cmd/add.go b/cmd/add.go
@@ -133,7 +133,7 @@ func init() {
 	}
 
 	addPortCmd.Flags().StringVar(&cmd.portFlags.ResourceType, "resource-type", "pod", "Selected resource type")
-	addSyncCmd.Flags().StringVar(&cmd.portFlags.Namespace, "namespace", "", "Namespace to use")
+	addPortCmd.Flags().StringVar(&cmd.portFlags.Namespace, "namespace", "", "Namespace to use")
 	addPortCmd.Flags().StringVar(&cmd.portFlags.Selector, "selector", "", "Comma separated key=value selector list (e.g. release=test)")
 
 	addCmd.AddCommand(addPortCmd)
@@ -405,7 +405,7 @@ func (cmd *AddCmd) insertOrReplacePortMapping(labelSelectorMap map[string]*strin
 	config := configutil.GetConfig()
 
 	// Check if we should add to existing port mapping
-	for _, v := range *config.DevSpace.PortForwarding {
+	for _, v := range *config.DevSpace.Ports {
 		var selectors map[string]*string
 
 		if v.LabelSelector != nil {
@@ -422,14 +422,14 @@ func (cmd *AddCmd) insertOrReplacePortMapping(labelSelectorMap map[string]*strin
 			return
 		}
 	}
-	portMap := append(*config.DevSpace.PortForwarding, &v1.PortForwardingConfig{
+	portMap := append(*config.DevSpace.Ports, &v1.PortForwardingConfig{
 		ResourceType:  nil,
 		LabelSelector: &labelSelectorMap,
 		PortMappings:  &portMappings,
 		Namespace:     &cmd.portFlags.Namespace,
 	})
 
-	config.DevSpace.PortForwarding = &portMap
+	config.DevSpace.Ports = &portMap
 }
 
 func isMapEqual(map1 map[string]*string, map2 map[string]*string) bool {
diff --git a/cmd/init.go b/cmd/init.go
@@ -347,7 +347,7 @@ func (cmd *InitCmd) configureRegistry() {
 	createInternalRegistryDefaultAnswer := "yes"
 
 	imageBuilder, err := docker.NewBuilder("", "", "", false)
-	if err != nil {
+	if err == nil {
 		log.StartWait("Checking Docker credentials")
 		dockerAuthConfig, err := imageBuilder.Authenticate("", "", true)
 		log.StopWait()
diff --git a/cmd/list.go b/cmd/list.go
@@ -198,7 +198,7 @@ func (cmd *ListCmd) RunListSync(cobraCmd *cobra.Command, args []string) {
 func (cmd *ListCmd) RunListPort(cobraCmd *cobra.Command, args []string) {
 	config := configutil.GetConfig()
 
-	if len(*config.DevSpace.PortForwarding) == 0 {
+	if len(*config.DevSpace.Ports) == 0 {
 		log.Write("No ports are forwarded. Run `devspace add port` to add a port that should be forwarded\n")
 		return
 	}
@@ -209,10 +209,10 @@ func (cmd *ListCmd) RunListPort(cobraCmd *cobra.Command, args []string) {
 		"Ports (Local:Remote)",
 	}
 
-	portForwards := make([][]string, 0, len(*config.DevSpace.PortForwarding))
+	portForwards := make([][]string, 0, len(*config.DevSpace.Ports))
 
 	// Transform values into string arrays
-	for _, value := range *config.DevSpace.PortForwarding {
+	for _, value := range *config.DevSpace.Ports {
 		selector := ""
 		for k, v := range *value.LabelSelector {
 			if len(selector) > 0 {
diff --git a/cmd/remove.go b/cmd/remove.go
@@ -296,10 +296,10 @@ func (cmd *RemoveCmd) RunRemovePort(cobraCmd *cobra.Command, args []string) {
 	}
 
 	ports := strings.Split(argPorts, ",")
-	newPortForwards := make([]*v1.PortForwardingConfig, 0, len(*config.DevSpace.PortForwarding)-1)
+	newPortForwards := make([]*v1.PortForwardingConfig, 0, len(*config.DevSpace.Ports)-1)
 
 OUTER:
-	for _, v := range *config.DevSpace.PortForwarding {
+	for _, v := range *config.DevSpace.Ports {
 		if cmd.portFlags.RemoveAll ||
 			isMapEqual(labelSelectorMap, *v.LabelSelector) {
 			continue
@@ -314,10 +314,9 @@ OUTER:
 		newPortForwards = append(newPortForwards, v)
 	}
 
-	config.DevSpace.PortForwarding = &newPortForwards
+	config.DevSpace.Ports = &newPortForwards
 
 	err = configutil.SaveConfig()
-
 	if err != nil {
 		log.Fatalf("Couldn't save config file: %s", err.Error())
 	}
diff --git a/cmd/up.go b/cmd/up.go
@@ -207,6 +207,7 @@ func (cmd *UpCmd) buildAndDeploy() {
 				log.Fatalf("Error deploying %s: %v", *deployConfig.Name, err)
 			}
 
+			log.StopWait()
 			log.Donef("Successfully deployed %s", *deployConfig.Name)
 		}
 
@@ -346,6 +347,11 @@ func (cmd *UpCmd) initRegistries() {
 	}
 
 	if registryMap != nil {
+		defaultNamespace, err := configutil.GetDefaultNamespace(config)
+		if err != nil {
+			log.Fatalf("Cannot get default namespace: %v", err)
+		}
+
 		for registryName, registryConf := range registryMap {
 			if registryConf.Auth != nil && registryConf.Auth.Password != nil {
 				if config.DevSpace.Deployments != nil {
@@ -362,8 +368,13 @@ func (cmd *UpCmd) initRegistries() {
 							registryURL = *registryConf.URL
 						}
 
+						namespace := *deployConfig.Namespace
+						if namespace == "" {
+							namespace = defaultNamespace
+						}
+
 						log.StartWait("Creating image pull secret for registry: " + registryName)
-						err := registry.CreatePullSecret(cmd.kubectl, *deployConfig.Namespace, registryURL, username, password, email)
+						err := registry.CreatePullSecret(cmd.kubectl, namespace, registryURL, username, password, email)
 						log.StopWait()
 
 						if err != nil {
diff --git a/pkg/devspace/config/configutil/get.go b/pkg/devspace/config/configutil/get.go
@@ -130,18 +130,14 @@ func SetDefaults(config *v1.Config) {
 			}
 		}
 
-		if config.DevSpace.PortForwarding != nil {
-			for _, portForwarding := range *config.DevSpace.PortForwarding {
+		if config.DevSpace.Ports != nil {
+			for _, portForwarding := range *config.DevSpace.Ports {
 				if portForwarding.Namespace == nil {
 					portForwarding.Namespace = String("")
 				}
 			}
 		}
 
-		if config.DevSpace.Terminal != nil && config.DevSpace.Terminal.Namespace == nil {
-			config.DevSpace.Terminal.Namespace = String("")
-		}
-
 		if needTiller && config.Tiller == nil {
 			config.Tiller = &v1.TillerConfig{
 				Namespace: &defaultNamespace,
diff --git a/pkg/devspace/config/configutil/make.go b/pkg/devspace/config/configutil/make.go
@@ -10,10 +10,10 @@ func makeConfig() *v1.Config {
 			User: &v1.ClusterUser{},
 		},
 		DevSpace: &v1.DevSpaceConfig{
-			Terminal:       &v1.Terminal{},
-			PortForwarding: &[]*v1.PortForwardingConfig{},
-			Deployments:    &[]*v1.DeploymentConfig{},
-			Sync:           &[]*v1.SyncConfig{},
+			Terminal:    &v1.Terminal{},
+			Ports:       &[]*v1.PortForwardingConfig{},
+			Deployments: &[]*v1.DeploymentConfig{},
+			Sync:        &[]*v1.SyncConfig{},
 		},
 		Images:     &map[string]*v1.ImageConfig{},
 		Registries: &map[string]*v1.RegistryConfig{},
diff --git a/pkg/devspace/config/generated/config.go b/pkg/devspace/config/generated/config.go
@@ -27,6 +27,7 @@ func LoadConfig() (*Config, error) {
 		return &Config{
 			DockerLatestTimestamps: make(map[string]int64),
 			ImageTags:              make(map[string]string),
+			ChartHashs:             make(map[string]string),
 		}, nil
 	}
 
@@ -36,6 +37,16 @@ func LoadConfig() (*Config, error) {
 		return nil, err
 	}
 
+	if config.ChartHashs == nil {
+		config.ChartHashs = make(map[string]string)
+	}
+	if config.DockerLatestTimestamps == nil {
+		config.DockerLatestTimestamps = make(map[string]int64)
+	}
+	if config.ImageTags == nil {
+		config.ImageTags = make(map[string]string)
+	}
+
 	return config, nil
 }
 
diff --git a/pkg/devspace/config/v1/devspace.go b/pkg/devspace/config/v1/devspace.go
@@ -2,10 +2,10 @@ package v1
 
 //DevSpaceConfig defines the devspace deployment
 type DevSpaceConfig struct {
-	Terminal       *Terminal                `yaml:"terminal"`
-	Deployments    *[]*DeploymentConfig     `yaml:"deployments,omitempty"`
-	PortForwarding *[]*PortForwardingConfig `yaml:"ports"`
-	Sync           *[]*SyncConfig           `yaml:"sync"`
+	Terminal    *Terminal                `yaml:"terminal"`
+	Deployments *[]*DeploymentConfig     `yaml:"deployments,omitempty"`
+	Ports       *[]*PortForwardingConfig `yaml:"ports"`
+	Sync        *[]*SyncConfig           `yaml:"sync"`
 }
 
 // PortForwardingConfig defines the ports for a port forwarding to a DevSpace
diff --git a/pkg/devspace/helm/install.go b/pkg/devspace/helm/install.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/covexo/devspace/pkg/devspace/config/configutil"
+
 	yaml "gopkg.in/yaml.v2"
 	helmchartutil "k8s.io/helm/pkg/chartutil"
 	"k8s.io/helm/pkg/downloader"
@@ -40,7 +42,19 @@ func checkDependencies(ch *chart.Chart, reqs *helmchartutil.Requirements) error
 }
 
 // InstallChartByPath installs the given chartpath und the releasename in the releasenamespace
-func (helmClientWrapper *ClientWrapper) InstallChartByPath(releaseName string, releaseNamespace string, chartPath string, values *map[interface{}]interface{}) (*hapi_release5.Release, error) {
+func (helmClientWrapper *ClientWrapper) InstallChartByPath(releaseName, releaseNamespace string, chartPath string, values *map[interface{}]interface{}) (*hapi_release5.Release, error) {
+	if releaseNamespace == "" {
+		config := configutil.GetConfig()
+
+		// Use default namespace here
+		defaultNamespace, err := configutil.GetDefaultNamespace(config)
+		if err != nil {
+			return nil, err
+		}
+
+		releaseNamespace = defaultNamespace
+	}
+
 	chart, err := helmchartutil.Load(chartPath)
 	if err != nil {
 		return nil, err
@@ -115,6 +129,9 @@ func (helmClientWrapper *ClientWrapper) InstallChartByPath(releaseName string, r
 		)
 
 		if err != nil {
+			// Try to delete and ignore errors, because otherwise we have a broken release laying around and always get the no deployed resources error
+			helmClientWrapper.DeleteRelease(releaseName, true)
+
 			return nil, err
 		}
 
diff --git a/pkg/devspace/kubectl/client.go b/pkg/devspace/kubectl/client.go
@@ -179,14 +179,16 @@ func GetNewestRunningPod(kubectl *kubernetes.Clientset, labelSelector, namespace
 			var selectedPod *k8sv1.Pod
 
 			for _, pod := range podList.Items {
-				if selectedPod == nil || pod.CreationTimestamp.After(selectedPod.CreationTimestamp.Time) {
+				if selectedPod == nil || pod.CreationTimestamp.Time.After(selectedPod.CreationTimestamp.Time) {
 					selectedPod = &pod
 				}
 			}
 
 			if selectedPod != nil && GetPodStatus(selectedPod) == "Running" {
 				return selectedPod, nil
 			}
+		} else {
+			log.Info("No selectable pod found")
 		}
 
 		time.Sleep(waitingInterval)
diff --git a/pkg/devspace/services/port_forwarding.go b/pkg/devspace/services/port_forwarding.go
@@ -17,7 +17,7 @@ import (
 func StartPortForwarding(client *kubernetes.Clientset, log log.Logger) error {
 	config := configutil.GetConfig()
 
-	for _, portForwarding := range *config.DevSpace.PortForwarding {
+	for _, portForwarding := range *config.DevSpace.Ports {
 		if portForwarding.ResourceType == nil || *portForwarding.ResourceType == "pod" {
 			if len(*portForwarding.LabelSelector) > 0 {
 				labels := make([]string, 0, len(*portForwarding.LabelSelector))
diff --git a/pkg/devspace/services/terminal.go b/pkg/devspace/services/terminal.go
@@ -76,8 +76,8 @@ func GetNameOfFirstHelmDeployment() string {
 
 	if config.DevSpace.Deployments != nil {
 		for _, deploymentConfig := range *config.DevSpace.Deployments {
-			if deploymentConfig.Helm != nil && deploymentConfig.Namespace != nil {
-				return *deploymentConfig.Namespace
+			if deploymentConfig.Helm != nil {
+				return *deploymentConfig.Name
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -130,18 +130,14 @@ func SetDefaults(config *v1.Config) {`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`		`- if config.DevSpace.PortForwarding != nil {`
`134`		`- for _, portForwarding := range *config.DevSpace.PortForwarding {`
	`133`	`+ if config.DevSpace.Ports != nil {`
	`134`	`+ for _, portForwarding := range *config.DevSpace.Ports {`
`135`	`135`	`if portForwarding.Namespace == nil {`
`136`	`136`	`portForwarding.Namespace = String("")`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
`141`		`- if config.DevSpace.Terminal != nil && config.DevSpace.Terminal.Namespace == nil {`
`142`		`- config.DevSpace.Terminal.Namespace = String("")`
`143`		`- }`
`144`		`-`
`145`	`141`	`if needTiller && config.Tiller == nil {`
`146`	`142`	`config.Tiller = &v1.TillerConfig{`
`147`	`143`	`Namespace: &defaultNamespace,`