Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/open.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion examples/kaniko/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1alpha2
version: v1alpha3
cluster:
kubeContext: minikube
namespace: devspace
Expand Down
10 changes: 5 additions & 5 deletions examples/microservices/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1alpha2
version: v1alpha3
cluster:
kubeContext: minikube
namespace: devspace
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/minikube/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1alpha2
version: v1alpha3
cluster:
kubeContext: minikube
namespace: devspace
Expand Down
9 changes: 4 additions & 5 deletions examples/php-mysql-example/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: v1alpha2
cluster:
cloudProvider: devspace-cloud
# kubeContext: minikube
version: v1alpha3
#cluster:
# kubeContext: minikube
deployments:
- helm:
chartPath: ./chart
Expand All @@ -28,4 +27,4 @@ dev:
images:
default:
createPullSecret: true
image: dscr.io/fabiankramm/devspace
image: dscr.io/yourusername/devspace
6 changes: 3 additions & 3 deletions examples/php-mysql-example/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/php-mysql-example/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions examples/quickstart-kubectl/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
version: v1alpha2
cluster:
cloudProvider: devspace-cloud
version: v1alpha3
#cluster:
# kubeContext: minikube
deployments:
- name: devspace-default
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart-kubectl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions examples/quickstart/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
version: v1alpha2
cluster:
cloudProvider: devspace-cloud
version: v1alpha3
#cluster:
# kubeContext: minikube
dev:
overrideImages:
Expand Down
4 changes: 2 additions & 2 deletions examples/quickstart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions examples/redeploy-instead-of-hot-reload/.devspace/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
version: v1alpha2
cluster:
cloudProvider: devspace-cloud
version: v1alpha3
#cluster:
# kubeContext: minikube
deployments:
- name: devspace-default
Expand Down
4 changes: 2 additions & 2 deletions examples/redeploy-instead-of-hot-reload/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/chart/component.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/generator/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down