Merge pull request #489 from devspace-cloud/cloud-refactor

FabianKramm · web-flow · commit 8de6bf3d2d16 · 2019-03-11T10:41:50.000-07:00
Update examples
diff --git a/cmd/open.go b/cmd/open.go
@@ -104,7 +104,7 @@ func (cmd *OpenCmd) RunOpen(cobraCmd *cobra.Command, args []string) {
 
 	// Check if domain there is a domain for the space
 	if space.Domain == nil {
-		log.Fatalf("Space %s has no domain. See https://devspace.cloud/docs/domains/connect on how to connect domains", space.Name)
+		log.Fatalf("Space %s has no domain. See https://devspace.cloud/docs/cloud/domains/connect on how to connect domains", space.Name)
 	}
 
 	now := time.Now()
diff --git a/examples/kaniko/.devspace/config.yaml b/examples/kaniko/.devspace/config.yaml
@@ -1,4 +1,4 @@
-version: v1alpha2
+version: v1alpha3
 cluster:
   kubeContext: minikube
   namespace: devspace
diff --git a/examples/microservices/.devspace/config.yaml b/examples/microservices/.devspace/config.yaml
@@ -1,4 +1,4 @@
-version: v1alpha2
+version: v1alpha3
 cluster:
   kubeContext: minikube
   namespace: devspace
@@ -41,13 +41,13 @@ dev:
 images:
   node:
     build:
-      contextPath: node/
-      dockerfilePath: node/Dockerfile
+      context: node/
+      dockerfile: node/Dockerfile
     image: node
     skipPush: true
   php:
     build:
-      contextPath: php/
-      dockerfilePath: php/Dockerfile
+      context: php/
+      dockerfile: php/Dockerfile
     image: php
     skipPush: true
diff --git a/examples/minikube/.devspace/config.yaml b/examples/minikube/.devspace/config.yaml
@@ -1,4 +1,4 @@
-version: v1alpha2
+version: v1alpha3
 cluster:
   kubeContext: minikube
   namespace: devspace
diff --git a/examples/php-mysql-example/.devspace/config.yaml b/examples/php-mysql-example/.devspace/config.yaml
@@ -1,7 +1,6 @@
-version: v1alpha2
-cluster:
-  cloudProvider: devspace-cloud
- # kubeContext: minikube
+version: v1alpha3
+#cluster:
+# kubeContext: minikube
 deployments:
 - helm:
     chartPath: ./chart
@@ -28,4 +27,4 @@ dev:
 images:
   default:
     createPullSecret: true
-    image: dscr.io/fabiankramm/devspace
+    image: dscr.io/yourusername/devspace
diff --git a/examples/php-mysql-example/README.md b/examples/php-mysql-example/README.md
@@ -1,14 +1,14 @@
 # Php Mysql example
 
-This example shows you how to develop and deploy a small php and mysql application with devspace on devspace.cloud. For a more detailed documentation, take a look at https://devspace.cloud/docs
+This example shows you how to develop and deploy a small php and mysql application with devspace. For a more detailed documentation, take a look at https://devspace.cloud/docs
 
 # Step 0: Prerequisites
 
 In order to get things ready do the following:
 1. Install docker
-2. Run `devspace login`
+2. Run `devspace login` (If you want to use your own cluster just skip this step)
 3. Exchange the image `dscr.io/yourusername/devspace` in `.devspace/config` and `chart/values.yaml` with your username (you can also use a different registry, but make sure you are logged in with `docker login`)
-4. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just erase the cloudProvider in `.devspace/config` and skip this step)
+4. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just skip this step and devspace will use the current kubectl context)
 
 # Step 1: Develop the application
 
diff --git a/examples/php-mysql-example/chart/values.yaml b/examples/php-mysql-example/chart/values.yaml
@@ -3,7 +3,7 @@ components:
   containers:
   - # Image tag will be automatically updated in runtime
     # when running devspace deploy or devspace dev
-    image: dscr.io/fabiankramm/devspace
+    image: dscr.io/yourusername/devspace
   service:
     name: external
     type: ClusterIP
diff --git a/examples/quickstart-kubectl/.devspace/config.yaml b/examples/quickstart-kubectl/.devspace/config.yaml
@@ -1,6 +1,5 @@
-version: v1alpha2
-cluster:
-  cloudProvider: devspace-cloud
+version: v1alpha3
+#cluster:
  # kubeContext: minikube
 deployments:
 - name: devspace-default
diff --git a/examples/quickstart-kubectl/README.md b/examples/quickstart-kubectl/README.md
@@ -7,9 +7,9 @@ This example shows you how to develop and deploy a small node express applicatio
 In order to get things ready do the following:
 1. Install docker
 2. Install kubectl (https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-3. Run `devspace login`
+3. Run `devspace login` (If you want to use your own cluster just skip this step)
 4. Exchange the image `dscr.io/yourusername/devspace` in `.devspace/config` and `kube/deployment.yaml` with your username (you can also use a different registry, but make sure you are logged in with `docker login`)
-5. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just erase the cloudProvider in `.devspace/config` and skip this step)
+5. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just skip this step and devspace will use the current kubectl context)
 
 # Step 1: Develop the application
 
diff --git a/examples/quickstart/.devspace/config.yaml b/examples/quickstart/.devspace/config.yaml
@@ -1,6 +1,5 @@
-version: v1alpha2
-cluster:
-  cloudProvider: devspace-cloud
+version: v1alpha3
+#cluster:
  # kubeContext: minikube
 dev:
   overrideImages:
diff --git a/examples/quickstart/README.md b/examples/quickstart/README.md
@@ -6,9 +6,9 @@ This example shows you how to develop and deploy a small node express applicatio
 
 In order to get things ready do the following:
 1. Install docker
-2. Run `devspace login`
+2. Run `devspace login` (If you want to use your own cluster just skip this step)
 3. Exchange the image `dscr.io/yourusername/devspace` in `.devspace/config` and `chart/values.yaml` with your username (you can also use a different registry, but make sure you are logged in with `docker login`)
-4. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just erase the cloudProvider in `.devspace/config` and skip this step)
+4. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just skip this step and devspace will use the current kubectl context)
 
 # Step 1: Develop the application
 
diff --git a/examples/redeploy-instead-of-hot-reload/.devspace/config.yaml b/examples/redeploy-instead-of-hot-reload/.devspace/config.yaml
@@ -1,6 +1,5 @@
-version: v1alpha2
-cluster:
-  cloudProvider: devspace-cloud
+version: v1alpha3
+#cluster:
  # kubeContext: minikube
 deployments:
 - name: devspace-default
diff --git a/examples/redeploy-instead-of-hot-reload/README.md b/examples/redeploy-instead-of-hot-reload/README.md
@@ -7,9 +7,9 @@ This example shows you how to develop a small go application with automated repe
 In order to get things ready do the following:
 1. Install docker
 2. Install kubectl (https://kubernetes.io/docs/tasks/tools/install-kubectl/)
-3. Run `devspace login`
+3. Run `devspace login` (If you want to use your own cluster just skip this step)
 4. Exchange the image `dscr.io/yourusername/devspace` in `.devspace/config` and `kube/deployment.yaml` with your username (you can also use a different registry, but make sure you are logged in with `docker login`)
-5. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just erase the cloudProvider in `.devspace/config` and skip this step)
+5. Run `devspace create space quickstart` to create a new kubernetes namespace in the devspace.cloud (if you want to use your own cluster just skip this step and devspace will use the current kubectl context)
 
 # Step 1: Develop the application
 
diff --git a/pkg/devspace/chart/component.go b/pkg/devspace/chart/component.go
@@ -26,7 +26,7 @@ func ListAvailableComponents() ([]*generator.ComponentSchema, error) {
 // AddComponent adds a component with the given name to the chart
 func AddComponent(chartPath string, name string) error {
 	// Check if devspace chart
-	_, err := os.Stat(filepath.Join(chartPath, "devspace-version.yaml"))
+	_, err := os.Stat(filepath.Join(chartPath, "devspace.yaml"))
 	if os.IsNotExist(err) {
 		return errors.New("Chart is not a devspace chart. `devspace add component` only works with the devspace chart")
 	}
diff --git a/pkg/devspace/generator/chart.go b/pkg/devspace/generator/chart.go
@@ -51,7 +51,7 @@ func (cg *ChartGenerator) Update(force bool) error {
 	_, err = os.Stat(cg.LocalPath)
 	if err == nil {
 		// Check if everything is correct
-		_, err := os.Stat(filepath.Join(cg.LocalPath, "devspace-version.yaml"))
+		_, err := os.Stat(filepath.Join(cg.LocalPath, "devspace.yaml"))
 		if force == false && os.IsNotExist(err) {
 			return fmt.Errorf("Error updating chart: Chart at %s is not a devspace-chart, you can force the update with `devspace update chart --force`", cg.LocalPath)
 		}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ func (cmd OpenCmd) RunOpen(cobraCmd cobra.Command, args []string) {`
`104`	`104`
`105`	`105`	`// Check if domain there is a domain for the space`
`106`	`106`	`if space.Domain == nil {`
`107`		`- log.Fatalf("Space %s has no domain. See https://devspace.cloud/docs/domains/connect on how to connect domains", space.Name)`
	`107`	`+ log.Fatalf("Space %s has no domain. See https://devspace.cloud/docs/cloud/domains/connect on how to connect domains", space.Name)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`now := time.Now()`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: v1alpha2`
	`1`	`+version: v1alpha3`
`2`	`2`	`cluster:`
`3`	`3`	`kubeContext: minikube`
`4`	`4`	`namespace: devspace`