update README

Author: gentele

README.md

@@ -1,23 +1,26 @@
 ![DevSpace Workflow](docs/website/static/img/header-readme.svg)
 
-# DevSpace CLI - Cloud-Native Development with Kubernetes
+# DevSpace - Cloud-Native Development with Kubernetes
 [![Build Status](https://travis-ci.org/covexo/devspace.svg?branch=master)](https://travis-ci.org/covexo/devspace)
 [![Go Report Card](https://goreportcard.com/badge/github.com/covexo/devspace)](https://goreportcard.com/report/github.com/covexo/devspace)
 [![Join the community on Spectrum Chart](https://withspectrum.github.io/badge/badge.svg)](https://spectrum.chat/devspace)
 
-With the DevSpace CLI, developers can build cloud-native applications directly inside a Kubernetes cluster. It works with any self-hosted Kubernetes cluster (e.g. minikube or baremetal) as well as with managed Kubernetes clusters provided by cloud platforms, e.g. Google Kubernetes Engine.
+With a DevSpace, you can build, test and run code directly inside any Kubernetes cluster. You can run `devspace up` in any of your projects and the client-only DevSpace CLI will start a DevSpace within your Kubernetes cluster. Keep coding as usual and the DevSpace CLI will sync any code change directly into the containers of your DevSpace. No more waiting for re-building images, re-deploying containers and restarting applications on every source code change. Simply edit your code with any IDE and run your code instantly inside your DevSpace.
 
 ## Why use a DevSpace?
-Your DevSpace lets you build, test and run code directly inside a Kubernetes cluster and:
-- Allows you to access cluster-internal services and data with ease
-- Works perfectly with your favorite **hot reloading** tools (e.g. nodemon)
-- Lets you iterate quickly: no more re-building and pushing images on every change
-- Integrates into your existing workflow: **code with your favorite IDE** and desktop tools
-- Allows you to build, test and run code directly inside Kubernetes (via **real-time code synchronization**)
-- Supports efficient debugging through port forwarding and terminal proxying
-- Provides **automatic image building** without the need to install Docker
-- Lets you migrate to Docker & Kubernetes within minutes
-- Works with any Kubernetes cluster (e.g. minikube, self-hosted or cloud platform)
+Program inside any Kubernetes cluster (e.g. minikube, self-hosted or cloud platform) and:
+- iterate quickly: no more re-building and pushing images on every change
+- save time with **hot reloading** tools (e.g. nodemon)
+- keep your existing workflow: **code with your favorite IDE** and desktop tools
+- access cluster-internal services and data with ease
+- debug efficiently with port forwarding and terminal proxying
+- migrate to Docker & Kubernetes within minutes
+
+## Demo
+coming soon
+
+## Installation
+
 
 ## Quickstart
 The DevSpace CLI allows you to create a DevSpace for any existing project with just a single command:
@@ -28,9 +31,6 @@ Take a look at the [Getting Started Guide](https://devspace.covexo.com/docs/gett
 
 **Note:** Don't worry, with the cleanup command `devspace reset`, you can easily reset your project and go back to local development.
 
-## Demo
-coming soon
-
 ## Documentation
 Here you can find some links to the most important pages of our documentation:
 - [Getting Started Guide](https://devspace.covexo.com/docs/getting-started/quickstart.html)

cmd/init.go

@@ -26,6 +26,8 @@ type InitCmd struct {
 	chartGenerator  *generator.ChartGenerator
 	config          *v1.Config
 	overwriteConfig *v1.Config
+	defaultImage    *v1.ImageConfig
+	defaultRegistry *v1.RegistryConfig
 }
 
 // InitCmdFlags are the flags available for the init-command
@@ -117,12 +119,25 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 				Namespace: configutil.String("default"),
 			},
 		},
-		Image: &v1.ImageConfig{
-			Name: configutil.String("devspace"),
+		Images: &map[string]*v1.ImageConfig{
+			"default": &v1.ImageConfig{
+				Name: configutil.String("devspace"),
+			},
+		},
+		Registries: &map[string]*v1.RegistryConfig{
+			"default": &v1.RegistryConfig{
+				Auth: &v1.RegistryAuth{},
+			},
 		},
 	})
 	cmd.overwriteConfig = configutil.GetOverwriteConfig()
 
+	imageMap := *cmd.config.Images
+	cmd.defaultImage, _ = imageMap["default"]
+
+	registryMap := *cmd.config.Registries
+	cmd.defaultRegistry, _ = registryMap["default"]
+
 	cmd.initChartGenerator()
 
 	createChart := cmd.flags.overwrite
@@ -153,7 +168,7 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
 		cmd.configureKubernetes()
 		cmd.configureDevSpace()
 
-		cmd.config.Image.Name = cmd.config.DevSpace.Release.Name
+		cmd.defaultImage.Name = cmd.config.DevSpace.Release.Name
 
 		cmd.configureTiller()
 		cmd.configureRegistry()
@@ -373,7 +388,6 @@ func (cmd *InitCmd) configureKubernetes() {
 }
 
 func (cmd *InitCmd) configureRegistry() {
-	registryConfig := cmd.config.Image.Registry
 	internalRegistryConfig := cmd.config.Services.InternalRegistry
 
 	enableAutomaticBuilds := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
@@ -386,8 +400,8 @@ func (cmd *InitCmd) configureRegistry() {
 		internalRegistryKey := "internal registry"
 		defaultRegistryValue := internalRegistryKey
 
-		if registryConfig.URL != nil {
-			defaultRegistryValue = *registryConfig.URL
+		if cmd.defaultRegistry.URL != nil {
+			defaultRegistryValue = *cmd.defaultRegistry.URL
 		}
 		registryURL := stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
 			Question:               "Which registry do you want to push to? (URL or 'internal registry')",
@@ -396,19 +410,27 @@ func (cmd *InitCmd) configureRegistry() {
 		})
 
 		if *registryURL != internalRegistryKey {
-			registryConfig.URL = registryURL
+			cmd.defaultRegistry.URL = registryURL
 			internalRegistryConfig = nil
 		} else {
-			registryConfig.URL = nil
-
 			if internalRegistryConfig.Release.Name == nil {
 				internalRegistryConfig.Release.Name = configutil.String("devspace-registry")
 			}
 
 			if internalRegistryConfig.Release.Namespace == nil {
 				internalRegistryConfig.Release.Namespace = cmd.config.DevSpace.Release.Namespace
 			}
-			registryAuth := cmd.overwriteConfig.Image.Registry.Auth
+			overwriteRegistryMap := *cmd.overwriteConfig.Registries
+
+			overwriteRegistryConfig, overwriteRegistryConfigFound := overwriteRegistryMap["default"]
+
+			if !overwriteRegistryConfigFound {
+				overwriteRegistryConfig = &v1.RegistryConfig{
+					Auth: &v1.RegistryAuth{},
+				}
+				overwriteRegistryMap["default"] = overwriteRegistryConfig
+			}
+			registryAuth := overwriteRegistryConfig.Auth
 
 			if registryAuth.Username == nil {
 				randomUserSuffix, err := randutil.GenerateRandomString(5)

cmd/up.go

@@ -41,7 +41,7 @@ type UpCmd struct {
 type UpCmdFlags struct {
 	tiller           bool
 	open             string
-	initRegistry     bool
+	initRegistries   bool
 	build            bool
 	shell            string
 	sync             bool
@@ -55,7 +55,7 @@ type UpCmdFlags struct {
 var UpFlagsDefault = &UpCmdFlags{
 	tiller:         true,
 	open:           "cmd",
-	initRegistry:   true,
+	initRegistries: true,
 	build:          true,
 	sync:           true,
 	deploy:         false,
@@ -130,7 +130,7 @@ func (cmd *UpCmd) Run(cobraCmd *cobra.Command, args []string) {
 
 	cmd.initHelm()
 
-	if cmd.flags.initRegistry {
+	if cmd.flags.initRegistries {
 		if cmd.flags.initRegistry && cmd.flags.imageDestination == "" {
 			log.StartWait("Initializing docker registry")
 			err := registry.InitRegistry(cmd.kubectl, cmd.helm)

pkg/devspace/config/v1/services.go

@@ -15,5 +15,4 @@ type TillerConfig struct {
 //InternalRegistry defines the deployment of an internal registry
 type InternalRegistry struct {
 	Release *Release `yaml:"release,omitempty"`
-	Host    *string  `yaml:"host,omitempty"`
 }