Fix various smaller issues

Author: FabianKramm

cmd/remove.go

@@ -253,25 +253,26 @@ func (cmd *RemoveCmd) RunRemoveSync(cobraCmd *cobra.Command, args []string) {
 		return
 	}
 
-	newSyncPaths := make([]*v1.SyncConfig, 0, len(*config.DevSpace.Sync)-1)
-
-	for _, v := range *config.DevSpace.Sync {
-		if cmd.syncFlags.RemoveAll ||
-			cmd.syncFlags.LocalPath == *v.LocalSubPath ||
-			cmd.syncFlags.ContainerPath == *v.ContainerPath ||
-			isMapEqual(labelSelectorMap, *v.LabelSelector) {
-			continue
-		}
-
-		newSyncPaths = append(newSyncPaths, v)
-	}
+	if config.DevSpace.Sync != nil && len(*config.DevSpace.Sync) > 0 {
+		newSyncPaths := make([]*v1.SyncConfig, 0, len(*config.DevSpace.Sync)-1)
+
+		for _, v := range *config.DevSpace.Sync {
+			if cmd.syncFlags.RemoveAll ||
+				cmd.syncFlags.LocalPath == *v.LocalSubPath ||
+				cmd.syncFlags.ContainerPath == *v.ContainerPath ||
+				isMapEqual(labelSelectorMap, *v.LabelSelector) {
+				continue
+			}
 
-	config.DevSpace.Sync = &newSyncPaths
+			newSyncPaths = append(newSyncPaths, v)
+		}
 
-	err = configutil.SaveConfig()
+		config.DevSpace.Sync = &newSyncPaths
 
-	if err != nil {
-		log.Fatalf("Couldn't save config file: %s", err.Error())
+		err = configutil.SaveConfig()
+		if err != nil {
+			log.Fatalf("Couldn't save config file: %s", err.Error())
+		}
 	}
 }
 
@@ -297,34 +298,37 @@ func (cmd *RemoveCmd) RunRemovePort(cobraCmd *cobra.Command, args []string) {
 	}
 
 	ports := strings.Split(argPorts, ",")
-	newPortForwards := make([]*v1.PortForwardingConfig, 0, len(*config.DevSpace.Ports)-1)
-
-	for _, v := range *config.DevSpace.Ports {
-		if cmd.portFlags.RemoveAll || isMapEqual(labelSelectorMap, *v.LabelSelector) {
-			continue
-		}
 
-		newPortMappings := []*v1.PortMapping{}
+	if config.DevSpace.Ports != nil && len(*config.DevSpace.Ports) > 0 {
+		newPortForwards := make([]*v1.PortForwardingConfig, 0, len(*config.DevSpace.Ports)-1)
 
-		for _, pm := range *v.PortMappings {
-			if containsPort(strconv.Itoa(*pm.LocalPort), ports) || containsPort(strconv.Itoa(*pm.RemotePort), ports) {
+		for _, v := range *config.DevSpace.Ports {
+			if cmd.portFlags.RemoveAll || isMapEqual(labelSelectorMap, *v.LabelSelector) {
 				continue
 			}
 
-			newPortMappings = append(newPortMappings, pm)
-		}
+			newPortMappings := []*v1.PortMapping{}
+
+			for _, pm := range *v.PortMappings {
+				if containsPort(strconv.Itoa(*pm.LocalPort), ports) || containsPort(strconv.Itoa(*pm.RemotePort), ports) {
+					continue
+				}
+
+				newPortMappings = append(newPortMappings, pm)
+			}
 
-		if len(newPortMappings) > 0 {
-			v.PortMappings = &newPortMappings
-			newPortForwards = append(newPortForwards, v)
+			if len(newPortMappings) > 0 {
+				v.PortMappings = &newPortMappings
+				newPortForwards = append(newPortForwards, v)
+			}
 		}
-	}
 
-	config.DevSpace.Ports = &newPortForwards
+		config.DevSpace.Ports = &newPortForwards
 
-	err = configutil.SaveConfig()
-	if err != nil {
-		log.Fatalf("Couldn't save config file: %s", err.Error())
+		err = configutil.SaveConfig()
+		if err != nil {
+			log.Fatalf("Couldn't save config file: %s", err.Error())
+		}
 	}
 }
 

pkg/devspace/helm/client.go

@@ -74,9 +74,9 @@ func NewClient(kubectlClient *kubernetes.Clientset, log log.Logger, upgradeTille
 		defer log.StopWait()
 
 		// Next we wait till we can establish a tunnel to the running pod
-		for tunnelWaitTime > 0 {
+		for true {
 			tunnel, err = portforwarder.New(tillerNamespace, kubectlClient, kubeconfig)
-			if err == nil {
+			if err == nil && tunnel != nil {
 				break
 			}
 

pkg/devspace/image/build.go

@@ -134,15 +134,20 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
 			}
 		}
 
-		log.StartWait("Authenticating (" + registryURL + ")")
+		displayRegistryURL := "hub.docker.com"
+		if registryURL != "" {
+			displayRegistryURL = registryURL
+		}
+
+		log.StartWait("Authenticating (" + displayRegistryURL + ")")
 		_, err = imageBuilder.Authenticate(username, password, len(username) == 0)
 		log.StopWait()
 
 		if err != nil {
 			log.Fatalf("Error during image registry authentication: %v", err)
 		}
 
-		log.Done("Authentication successful (" + registryURL + ")")
+		log.Done("Authentication successful (" + displayRegistryURL + ")")
 
 		buildOptions := &types.ImageBuildOptions{}
 
@@ -168,7 +173,7 @@ func Build(client *kubernetes.Clientset, generatedConfig *generated.Config, imag
 			return false, fmt.Errorf("Error during image push: %v", err)
 		}
 
-		log.Info("Image pushed to registry (" + registryURL + ")")
+		log.Info("Image pushed to registry (" + displayRegistryURL + ")")
 
 		// Update config
 		generatedConfig.ImageTags[imageName] = imageTag