several improvements for gke and gcr

Author: gentele

cmd/init.go

@@ -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/reset.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,6 +157,13 @@ 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())
+		}
+	}
 }
 
 func (cmd *ResetCmd) determineResetExtent() {
@@ -163,24 +179,34 @@ func (cmd *ResetCmd) determineResetExtent() {
 	}) == "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 +224,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 +249,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 +268,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)
 }
 

cmd/up.go

@@ -3,11 +3,14 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/covexo/devspace/pkg/util/stdinutil"
+
 	"github.com/covexo/devspace/pkg/util/yamlutil"
 
 	"github.com/covexo/devspace/pkg/devspace/builder"
@@ -33,8 +36,9 @@ import (
 	"github.com/covexo/devspace/pkg/devspace/config/configutil"
 	"github.com/spf13/cobra"
 	k8sv1 "k8s.io/api/core/v1"
+	k8sv1beta1 "k8s.io/api/rbac/v1beta1"
 	"k8s.io/client-go/kubernetes"
-	"k8s.io/client-go/util/exec"
+	kubectlExec "k8s.io/client-go/util/exec"
 )
 
 // UpCmd is a struct that defines a command call for "up"
@@ -72,6 +76,8 @@ var UpFlagsDefault = &UpCmdFlags{
 	noSleep:        false,
 }
 
+const clusterRoleBindingName = "devspace-users"
+
 func init() {
 	cmd := &UpCmd{
 		flags: UpFlagsDefault,
@@ -136,6 +142,11 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 		log.Fatalf("Unable to create release namespace: %v", err)
 	}
 
+	err = cmd.ensureClusterRoleBinding()
+	if err != nil {
+		log.Fatalf("Unable to create ClusterRoleBinding: %v", err)
+	}
+
 	cmd.initHelm()
 
 	if cmd.flags.initRegistries {
@@ -194,6 +205,68 @@ func (cmd *UpCmd) ensureNamespace() error {
 	return nil
 }
 
+func (cmd *UpCmd) ensureClusterRoleBinding() error {
+	_, err := cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Get(clusterRoleBindingName, metav1.GetOptions{})
+
+	if err != nil {
+		createRoleBinding := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+			Question:               "Do you want the ClusterRoleBinding '" + clusterRoleBindingName + "' to be created automatically? (yes|no)",
+			DefaultValue:           "yes",
+			ValidationRegexPattern: "^(yes)|(no)$",
+		})
+
+		if *createRoleBinding == "no" {
+			log.Fatal("Please create ClusterRoleBinding '" + clusterRoleBindingName + "' manually")
+		}
+		username := configutil.String("")
+
+		clusterConfig, _ := kubectl.GetClientConfig()
+
+		if clusterConfig.Username == "" {
+			gcloudOutput, gcloudErr := exec.Command("gcloud", "config", "list", "account", "--format", "value(core.account)").Output()
+
+			if gcloudErr == nil {
+				gcloudEmail := strings.TrimSuffix(strings.TrimSuffix(string(gcloudOutput), "\r\n"), "\n")
+
+				if gcloudEmail != "" {
+					username = &gcloudEmail
+				}
+			}
+		} else {
+			username = &clusterConfig.Username
+		}
+
+		username = stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
+			Question:               "What is your cluster username? (Email address of the Google account for GKE clusters)",
+			DefaultValue:           *username,
+			ValidationRegexPattern: ".+",
+		})
+
+		rolebinding := &k8sv1beta1.ClusterRoleBinding{
+			ObjectMeta: metav1.ObjectMeta{
+				Name: clusterRoleBindingName,
+			},
+			Subjects: []k8sv1beta1.Subject{
+				{
+					Kind: "User",
+					Name: *username,
+				},
+			},
+			RoleRef: k8sv1beta1.RoleRef{
+				APIGroup: "rbac.authorization.k8s.io",
+				Kind:     "ClusterRole",
+				Name:     "cluster-admin",
+			},
+		}
+
+		_, roleBindingErr := cmd.kubectl.RbacV1beta1().ClusterRoleBindings().Create(rolebinding)
+		if roleBindingErr != nil {
+			return roleBindingErr
+		}
+	}
+	return nil
+}
+
 func (cmd *UpCmd) initRegistries() {
 	config := configutil.GetConfig(false)
 	registryMap := *config.Registries
@@ -351,12 +424,12 @@ func (cmd *UpCmd) buildImages(buildFlagChanged bool) bool {
 
 			log.Infof(buildInfo, imageName, engineName)
 
-			username := ""
-			password := ""
-
 			if registryConf.URL != nil {
 				registryURL = *registryConf.URL
 			}
+
+			username := ""
+			password := ""
 			if registryConf.Auth != nil {
 				if registryConf.Auth.Username != nil {
 					username = *registryConf.Auth.Username
@@ -668,7 +741,7 @@ func (cmd *UpCmd) enterTerminal() {
 	_, _, _, terminalErr := kubectl.Exec(cmd.kubectl, cmd.pod, cmd.pod.Spec.Containers[0].Name, shell, true, nil)
 
 	if terminalErr != nil {
-		if _, ok := terminalErr.(exec.CodeExitError); ok == false {
+		if _, ok := terminalErr.(kubectlExec.CodeExitError); ok == false {
 			log.Fatalf("Unable to start terminal session: %s", terminalErr.Error())
 		}
 	}