Merge pull request #235 from covexo/issue-233

Issue 233

Author: Lukas Gentele

Gopkg.lock

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -480,6 +481,9 @@ func (cmd *InitCmd) configureRegistry() {
 				}
 			}
 		}
+		googleRegistryRegex := regexp.MustCompile("^(.+\\.)?gcr.io$")
+		isGoogleRegistry := googleRegistryRegex.Match([]byte(*registryURL))
+		isDockerHub := *registryURL == "hub.docker.com"
 
 		if dockerUsername == "" {
 			if cmd.defaultImage.Build.Engine.Docker != nil {
@@ -519,11 +523,10 @@ func (cmd *InitCmd) configureRegistry() {
 				})
 			}
 		}
+		defaultImageName := *cmd.defaultImage.Name
+		defaultImageNameParts := strings.Split(defaultImageName, "/")
 
-		if *registryURL == "hub.docker.com" {
-			defaultImageName := *cmd.defaultImage.Name
-			defaultImageNameParts := strings.Split(defaultImageName, "/")
-
+		if isDockerHub {
 			if len(defaultImageNameParts) < 2 {
 				defaultImageName = dockerUsername + "/" + strings.TrimPrefix(defaultImageName, dockerUsername)
 			}
@@ -534,6 +537,17 @@ func (cmd *InitCmd) configureRegistry() {
 				ValidationRegexPattern: "^[a-zA-Z0-9/]{4,30}$",
 			})
 		}
+
+		if isGoogleRegistry {
+			if len(defaultImageNameParts) < 2 {
+				gcloudProjectName := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+					Question:               "What is the name of your Google Cloud Project? (run 'gcloud config get-value project' to get the project name)",
+					DefaultValue:           "",
+					ValidationRegexPattern: "^.*$",
+				})
+				cmd.defaultImage.Name = configutil.String(*gcloudProjectName + "/" + strings.TrimPrefix(defaultImageName, *gcloudProjectName))
+			}
+		}
 	} else {
 		imageMap := *cmd.config.Images
 		defaultImageConf, defaultImageExists := imageMap["default"]

cmd/init.go

@@ -12,6 +12,7 @@ import (
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
 
 	"github.com/spf13/cobra"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
@@ -25,12 +26,13 @@ type ResetCmd struct {
 
 // ResetCmdFlags holds the command flags
 type ResetCmdFlags struct {
-	deleteDockerfile     bool
-	deleteChart          bool
-	deleteRegistry       bool
-	deleteTiller         bool
-	deleteDevspaceFolder bool
-	deleteRelease        bool
+	deleteDockerfile         bool
+	deleteChart              bool
+	deleteRegistry           bool
+	deleteTiller             bool
+	deleteDevspaceFolder     bool
+	deleteRelease            bool
+	deleteClusterRoleBinding bool
 }
 
 func init() {
@@ -67,6 +69,13 @@ command: devspace down
 // Run executes the reset command logic
 func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
 	var err error
+
+	if cmd.kubectl == nil || cmd.helm == nil {
+		cmd.kubectl, err = kubectl.NewClient()
+		if err != nil {
+			log.Failf("Failed to initialize kubectl client: ", err.Error())
+		}
+	}
 	cmd.determineResetExtent()
 
 	if cmd.flags.deleteRelease {
@@ -148,39 +157,63 @@ func (cmd *ResetCmd) Run(cobraCmd *cobra.Command, args []string) {
 			log.Done("Successfully deleted .devspace folder")
 		}
 	}
+
+	if cmd.flags.deleteClusterRoleBinding {
+		err = cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Delete(clusterRoleBindingName, &metav1.DeleteOptions{})
+		if err != nil {
+			log.Failf("Failed to remove ClusterRoleBinding: ", err.Error())
+		} else {
+			log.Done("Successfully deleted ClusterRoleBinding '" + clusterRoleBindingName + "'")
+		}
+	}
 }
 
 func (cmd *ResetCmd) determineResetExtent() {
 	config := configutil.GetConfig(false)
 
-	cmd.flags.deleteDevspaceFolder = true
 	cmd.flags.deleteRelease = true
 
+	cmd.flags.deleteDevspaceFolder = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+		Question:               "Should the .devspace folder be removed? (y/n)",
+		DefaultValue:           "y",
+		ValidationRegexPattern: "^(y|n)$",
+	}) == "y"
+
 	cmd.flags.deleteDockerfile = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 		Question:               "Should the Dockerfile be removed? (y/n)",
 		DefaultValue:           "y",
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"
 
 	cmd.flags.deleteChart = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Should the Chart (chart/*) be removed ? (y/n)",
+		Question:               "Should the Chart (chart/*) be removed? (y/n)",
 		DefaultValue:           "y",
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"
 
 	if config.Services.InternalRegistry != nil {
 		cmd.flags.deleteRegistry = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-			Question:               "Should the internal registry be removed ? (y/n)",
+			Question:               "Should the internal registry be removed? (y/n)",
 			DefaultValue:           "y",
 			ValidationRegexPattern: "^(y|n)$",
 		}) == "y"
 	}
 
 	cmd.flags.deleteTiller = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
-		Question:               "Should the tiller server be removed ? (y/n)",
+		Question:               "Should the tiller server be removed? (y/n)",
 		DefaultValue:           "y",
 		ValidationRegexPattern: "^(y|n)$",
 	}) == "y"
+
+	_, err := cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Get(clusterRoleBindingName, metav1.GetOptions{})
+
+	if err == nil {
+		cmd.flags.deleteClusterRoleBinding = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+			Question:               "Should the ClusterRoleBinding '" + clusterRoleBindingName + "' be removed? (y/n)",
+			DefaultValue:           "y",
+			ValidationRegexPattern: "^(y|n)$",
+		}) == "y"
+	}
 }
 
 func (cmd *ResetCmd) shouldContinue() bool {
@@ -198,12 +231,6 @@ func (cmd *ResetCmd) deleteRelease() error {
 	releaseName := *config.DevSpace.Release.Name
 
 	if cmd.kubectl == nil || cmd.helm == nil {
-		cmd.kubectl, err = kubectl.NewClient()
-
-		if err != nil {
-			return err
-		}
-
 		isDeployed := helmClient.IsTillerDeployed(cmd.kubectl, config.Services.Tiller)
 
 		if isDeployed == false {
@@ -229,12 +256,6 @@ func (cmd *ResetCmd) deleteRegistry() error {
 	registryReleaseName := *config.Services.InternalRegistry.Release.Name
 
 	if cmd.kubectl == nil || cmd.helm == nil {
-		cmd.kubectl, err = kubectl.NewClient()
-
-		if err != nil {
-			return err
-		}
-
 		isDeployed := helmClient.IsTillerDeployed(cmd.kubectl, config.Services.Tiller)
 
 		if isDeployed == false {
@@ -254,17 +275,8 @@ func (cmd *ResetCmd) deleteRegistry() error {
 }
 
 func (cmd *ResetCmd) deleteTiller() error {
-	var err error
 	config := configutil.GetConfig(false)
 
-	if cmd.kubectl == nil {
-		cmd.kubectl, err = kubectl.NewClient()
-
-		if err != nil {
-			return err
-		}
-	}
-
 	return helmClient.DeleteTiller(cmd.kubectl, config.Services.Tiller)
 }