Skip to content

Commit d5d6eaa

Browse files
committed
Merge branch 'master' of https://github.com/covexo/devspace into cloud-refactor
2 parents a57ed50 + ba40419 commit d5d6eaa

File tree

136 files changed

+629
-649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+629
-649
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ about: Create a report to help us reproduce and fix a bug
2020
- Deployment method: helm | kubectl apply
2121

2222
**Kubernetes Cluster:**
23-
- Cloud Provider: google | aws | azure | DevSpace.cloud | DevSpace Cloud Enterprise | other
23+
- Cloud Provider: google | aws | azure | DevSpace Cloud | DevSpace Cloud Enterprise | other
2424
- Kubernetes Version: [use `kubectl version`]
2525

2626
**Anything else we need to know?**

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Contribution Guidelines
2-
Please read this guide if you plan to contribute to the DevSpace.cli. We welcome any kind of contribution. No matter if you are an experienced programmer or just starting, we are looking forward to your contribution.
2+
Please read this guide if you plan to contribute to the DevSpace CLI. We welcome any kind of contribution. No matter if you are an experienced programmer or just starting, we are looking forward to your contribution.
33

44
## Reporting Issues
5-
If you find a bug while working with the DevSpace.cli, please [open an issue on GitHub](https://github.com/devspace-cloud/devspace/issues/new?labels=kind%2Fbug&template=bug-report.md&title=Bug:) and let us know what went wrong. We will try to fix it as quickly as we can.
5+
If you find a bug while working with the DevSpace CLI, please [open an issue on GitHub](https://github.com/devspace-cloud/devspace/issues/new?labels=kind%2Fbug&template=bug-report.md&title=Bug:) and let us know what went wrong. We will try to fix it as quickly as we can.
66

77
## Feature Requests
88
You are more than welcome to open issues in this project to [suggest new features](https://github.com/devspace-cloud/devspace/issues/new?labels=kind%2Ffeature&template=feature-request.md&title=Feature%20Request:).

README.md

Lines changed: 52 additions & 181 deletions
Large diffs are not rendered by default.

cmd/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,15 +158,15 @@ func (cmd *InitCmd) Run(cobraCmd *cobra.Command, args []string) {
158158
// Check if kubectl exists
159159
if _, err := os.Stat(clientcmd.RecommendedHomeFile); err == nil {
160160
cmd.flags.useCloud = *stdinutil.GetFromStdin(&stdinutil.GetFromStdinParams{
161-
Question: "Do you want to use DevSpace.cloud?",
161+
Question: "Do you want to use DevSpace Cloud?",
162162
DefaultValue: "yes",
163163
Options: []string{"yes", "no"},
164164
}) == "yes"
165165
}
166166

167167
var providerName *string
168168

169-
// Check if DevSpace.cloud should be used
169+
// Check if DevSpace Cloud should be used
170170
if cmd.flags.useCloud == false {
171171
cmd.configureDevSpace()
172172
} else {

cmd/install.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func init() {
3434

3535
cobraCmd := &cobra.Command{
3636
Use: "install",
37-
Short: "Installs the DevSpace.cli",
37+
Short: "Installs the DevSpace CLI",
3838
Long: `
3939
#######################################################
4040
################## devspace install ###################

cmd/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func NewLoginCmd() *cobra.Command {
1717

1818
loginCmd := &cobra.Command{
1919
Use: "login",
20-
Short: "Log into DevSpace.cloud",
20+
Short: "Log into DevSpace Cloud",
2121
Long: `
2222
#######################################################
2323
################### devspace login ####################

cmd/root.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var cfgFile string
2323
// rootCmd represents the base command when called without any subcommands
2424
var rootCmd = &cobra.Command{
2525
Use: "devspace",
26-
Short: "Welcome to the DevSpace.cli!",
26+
Short: "Welcome to the DevSpace CLI!",
2727
Long: `DevSpace accelerates developing, deploying and debugging applications with Docker and Kubernetes. Get started by running the init command in one of your projects:
2828
2929
devspace init`,
@@ -39,7 +39,7 @@ func Execute() {
3939
newerVersion, err := upgrade.CheckForNewerVersion()
4040

4141
if err == nil && newerVersion != "" {
42-
log.Warnf("There is a newer version of devspace cli v%s. Run `devspace upgrade` to update the cli.\n", newerVersion)
42+
log.Warnf("There is a newer version of DevSpace CLI v%s. Run `devspace upgrade` to update the CLI.\n", newerVersion)
4343
}
4444
}
4545
}

cmd/upgrade.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ func init() {
2222

2323
cobraCmd := &cobra.Command{
2424
Use: "upgrade",
25-
Short: "Upgrade the DevSpace.cli to the newest version",
25+
Short: "Upgrade the DevSpace CLI to the newest version",
2626
Long: `
2727
#######################################################
2828
################## devspace upgrade ###################
2929
#######################################################
30-
Upgrades the DevSpace.cli to the newest version
30+
Upgrades the DevSpace CLI to the newest version
3131
#######################################################`,
3232
Args: cobra.NoArgs,
3333
Run: cmd.Run,

docs/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# DevSpace.cli Documentation
1+
# DevSpace CLI Documentation
22
This documentation is created with Docusaurus.
33

44
## Contributing
55
To contribute code,
66
1. Fork the project
7-
2. Clone the DevSpace.cli project: `git clone https://github.com/[YOUR_USERNAME]/devspace && cd devspace/docs/website`
7+
2. Clone the DevSpace CLI project: `git clone https://github.com/[YOUR_USERNAME]/devspace && cd devspace/docs/website`
88
3. Start a DevSpace for the docs page: `devspace up`
99
4. Wait for the DevSpace terminal to open and run: `npm run start`
1010
5. Make changes
@@ -15,5 +15,5 @@ To contribute code,
1515

1616
Docusaurus allows you to use hot reloading when editing the docs pages, so you can now edit any docs page in ./docs and Docusaurus will recompile the markdown and reload the website automatically.
1717

18-
## [Contribution Guidelines](../CONTRIBUTING.md)
19-
For general information regarding contributions see: [Contribution Guidelines](../CONTRIBUTING.md)
18+
## [Contribution Guidelines](/docs/CONTRIBUTING.md)
19+
For general information regarding contributions see: [Contribution Guidelines](/docs/CONTRIBUTING.md)

docs/pages/advanced/external-clusters.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)