Merge branch 'master' of https://github.com/loft-sh/devspace

Author: FabianKramm

CODEOWNERS

@@ -0,0 +1 @@
+*       @FabianKramm @LukasGentele

README.md

@@ -8,7 +8,7 @@
 ![Total Downloads (GitHub Releases)](https://img.shields.io/github/downloads/loft-sh/devspace/total?style=for-the-badge&label=Total%20Downloads&color=%23007ec6)
 ![NPM Installs per Month](https://img.shields.io/npm/dm/devspace?label=NPM%20Installs&style=for-the-badge&color=%23007ec6)
 
-[![Join us on Slack!](docs/static/img/slack.svg)](https://slack.k8s.io/#devspace)
+[![Join us on Slack!](docs/static/img/slack.svg)](https://slack.loft.sh/)
 
 ### Client-Only Developer Tool for Cloud-Native Development with Kubernetes
 - **Build, test and debug applications directly inside Kubernetes**
@@ -123,7 +123,7 @@ DevSpace runs as a single binary CLI tool directly on your computer and ideally,
 
 Help us make DevSpace the best tool for developing, deploying and debugging Kubernetes apps.
 
-[![Join us on Slack!](docs/static/img/slack.svg)](https://slack.k8s.io/#devspace)
+[![Join us on Slack!](docs/static/img/slack.svg)](https://slack.loft.sh/)
 
 ### Reporting Issues
 

ROADMAP.md

@@ -0,0 +1,16 @@
+# DevSpace Roadmap
+This is a collection of roadmap priority items for DevSpace. Please add a PR to update this doc and ideally reference issues where applicable.
+
+## Short-Term Priorities
+- Graduate DevSpace v6 From Beta To Stable (Aug 15, tentative)
+- Contribute DevSpace to CNCF
+- Move CI images to ghcr.io
+- Improve support for git in dev container (better sync for .git/ folder, non-blocking sync) [https://github.com/loft-sh/devspace/issues/2174]
+- Publish jsonschema for config and add docs for setting this up in popular IDEs [https://github.com/loft-sh/devspace/issues/1652]
+
+## Long-Term Priorities
+- Improve integration into IDEs (VS Code plugin, IntelliJ plugin) [https://github.com/loft-sh/devspace/discussions/2187]
+- Redesign localhost UI (more customizability and user-facing localhost API exposed via CLI) [https://github.com/loft-sh/devspace/issues/1574]
+- Better upgrade handling (locking team to certain version, supporting multi-version installs, prevent rate limit issues) [https://github.com/loft-sh/devspace/issues/1330, https://github.com/loft-sh/devspace/issues/339]
+- Docker Desktop plugin
+- Improve use of DevSpace in CI/CD

cmd/use/namespace.go

@@ -4,6 +4,8 @@ import (
 	"context"
 
 	"github.com/loft-sh/devspace/cmd/flags"
+	corev1 "k8s.io/api/core/v1"
+	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	"github.com/loft-sh/devspace/pkg/util/factory"
@@ -16,7 +18,8 @@ import (
 
 type namespaceCmd struct {
 	*flags.GlobalFlags
-	Reset bool
+	Reset  bool
+	Create bool
 }
 
 func newNamespaceCmd(f factory.Factory, globalFlags *flags.GlobalFlags) *cobra.Command {
@@ -42,6 +45,7 @@ devspace use namespace my-namespace
 	}
 
 	useNamespace.Flags().BoolVar(&cmd.Reset, "reset", false, "Resets the default namespace of the current kube-context")
+	useNamespace.Flags().BoolVar(&cmd.Create, "create", false, "Create the namespace if it doesn't exist")
 
 	return useNamespace
 }
@@ -74,6 +78,13 @@ func (cmd *namespaceCmd) RunUseNamespace(f factory.Factory, cobraCmd *cobra.Comm
 	namespace := ""
 	if len(args) > 0 {
 		namespace = args[0]
+		if cmd.Create {
+			ns := &corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: namespace}}
+			_, err := client.KubeClient().CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
+			if err != nil && !kerrors.IsAlreadyExists(err) {
+				return errors.Errorf("Unable to create namespace: %v", err)
+			}
+		}
 	} else if !cmd.Reset {
 		namespaceList, err := client.KubeClient().CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})
 		if err != nil {

docs/package.json

@@ -16,7 +16,7 @@
     "docusaurus-plugin-sass": "^0.2.2",
     "mdx-link-checker": "^0.1.1",
     "mdx-mermaid": "^1.2.2",
-    "mermaid": "^8.14.0",
+    "mermaid": "^9.1.2",
     "plugin-image-zoom": "ataft/plugin-image-zoom",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",

docs/pages/cli/devspace_use_namespace.md

@@ -27,7 +27,8 @@ devspace use namespace my-namespace
 
 ## Flags
 
-```
+```      
+      --create  Create the namespace if it doesn't exist
   -h, --help    help for namespace
       --reset   Resets the default namespace of the current kube-context
 ```
@@ -48,4 +49,3 @@ devspace use namespace my-namespace
   -s, --switch-context               Switches and uses the last kube context and namespace that was used to deploy the DevSpace project
       --var strings                  Variables to override during execution (e.g. --var=MYVAR=MYVALUE)
 ```
-

docs/pages/configuration/imports/README.mdx

@@ -17,7 +17,7 @@ Let's say we have a `devspace.yaml` in `project-a` with the following content:
 ```yaml title="File: github.com/project-a/devspace.yaml"
 version: v2beta1
 imports:
-- git: github.com/project-b/devspace.yaml
+- git: github.com/project-b.git
   tag: v1.2.0
 - ...
 functions:
@@ -61,7 +61,7 @@ Let's assume the following `devspace.yaml` inside `project-a`:
 ```yaml title="File: github.com/project-a/devspace.yaml"
 version: v2beta1
 imports:
-- git: github.com/project-b/devspace.yaml
+- git: github.com/project-b.git
 functions:
   function_x: |-
     echo "This is a function_x from project-a"

docs/pages/getting-started/initialize-project.mdx

@@ -32,7 +32,10 @@ devspace init
 
 
 info Detecting programming language...
+```
 
+DevSpace's initialization wizard will walk you through the setup of the project
+```
 ? Select the programming language of this project  [Use arrows to move, type to filter]
   c# (dotnet)
 > go
@@ -42,8 +45,60 @@ info Detecting programming language...
   php
   python
 ```
+Choose the language of your quickstart project. This will determine the correct [devImage](/configuration/dev/modifications/dev-image).
+
+```
+? How do you want to deploy this project?  [Use arrows to move, type to filter]
+> helm
+  kubectl
+  kustomize
+```
+Now, you can pick your preferred way to deploy the project. For now, choose [`helm`](/configuration/deployments/helm/), you can always mix and match later.
+
+```
+? Is this a DevSpace Quickstart project?  [Use arrows to move, type to filter]
+> Yes
+  No
+```
+DevSpace can detect when you're using a quickstart project.
+
+```
+? Do you want to develop this project with DevSpace or just deploy it?  [Use arrows to move, type to filter]  [Use arrows to move, type to filter]
+> I want to develop this project and my current working dir contains the source code
+  I just want to deploy this project
+```
+When initializing DevSpace, you can ask it to monitor the source code for changes, or to only set up what's needed for deploying your application.  
+Since we want to see how DevSpace handles the entire development cycle, choose the first option here.
 
-DevSpace will ask you a couple of questions about this project, e.g. which programming language the application is written in, how to deploy the project, etc.
+```
+? How should DevSpace build the container image for this project?  [Use arrows to move, type to filter]
+> Use this existing Dockerfile: ./Dockerfile
+  Use a different Dockerfile (e.g. ./backend/Dockerfile)
+  Use alternative build tool (e.g. jib, bazel)
+  Skip / I don't know
+```
+DevSpace expects to receive instructions, how to containerize the source code. For the quickstart projects, a Dockerfile is provided in the root folder.
+
+```
+? If you were to push any images, which container registry would you want to push to?  [Use arrows to move, type to filter]
+> Skip Registry
+  Use hub.docker.com
+  Use GitHub image registry
+  Use other registry
+```
+For local development and quick feedback cycles, we recommend to skip pushing images to any registry.
+
+```
+done Project successfully initialized
+info Configuration saved in devspace.yaml - you can make adjustments as needed
+
+You can now run:
+1. devspace use namespace - to pick which Kubernetes namespace to work in
+2. devspace dev - to start developing your project in Kubernetes
+
+Run `devspace -h` or `devspace [command] -h` to see a list of available commands and flags
+```
+Congratulations! You have succesfully initialized your first DevSpace project! 🎉
 
 After running `devspace init`, you will see 3 changes in your project:
 1. New file `devspace.yaml` (tells DevSpace how this project should be build, deployed, and developed)

docs/yarn.lock

@@ -1170,10 +1170,10 @@
     "@babel/helper-validator-identifier" "^7.16.7"
     to-fast-properties "^2.0.0"
 
-"@braintree/sanitize-url@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd"
-  integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg==
+"@braintree/sanitize-url@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f"
+  integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w==
 
 "@docsearch/css@3.0.0":
   version "3.0.0"
@@ -1599,15 +1599,37 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
 "@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
 "@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
 "@jridgewell/trace-mapping@^0.3.0":
   version "0.3.4"
@@ -1617,6 +1639,14 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@mdx-js/mdx@^1.5.5", "@mdx-js/mdx@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
@@ -2245,9 +2275,9 @@ acorn-walk@^8.0.0:
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^8.0.4, acorn@^8.4.1, acorn@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
 address@^1.0.1, address@^1.1.2:
   version "1.1.2"
@@ -4331,15 +4361,10 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0:
   dependencies:
     domelementtype "^2.2.0"
 
-dompurify@2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.5.tgz#c83ed5a3ae5ce23e52efe654ea052ffb358dd7e3"
-  integrity sha512-kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ==
-
-dompurify@^2.2.8:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
-  integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
+dompurify@2.3.8, dompurify@^2.2.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.8.tgz#224fe9ae57d7ebd9a1ae1ac18c1c1ca3f532226f"
+  integrity sha512-eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw==
 
 domutils@1.5.1:
   version "1.5.1"
@@ -6073,10 +6098,10 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-khroma@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.4.1.tgz#ad6a5b6a972befc5112ce5129887a1a83af2c003"
-  integrity sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q==
+khroma@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.0.0.tgz#7577de98aed9f36c7a474c4d453d94c0d6c6588b"
+  integrity sha512-2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
@@ -6424,18 +6449,18 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mermaid@^8.14.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.14.0.tgz#ef589b0537f56d6340069070edb51719a4faba00"
-  integrity sha512-ITSHjwVaby1Li738sxhF48sLTxcNyUAoWfoqyztL1f7J6JOLpHOuQPNLBb6lxGPUA0u7xP9IRULgvod0dKu35A==
+mermaid@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-9.1.2.tgz#98cdc55603464240987fe1a15f68dd06304c07f1"
+  integrity sha512-RVf3hBKqiMfyORHboCaEjOAK1TomLO50hYRPvlTrZCXlCniM5pRpe8UlkHBjjpaLtioZnbdYv/vEVj7iKnwkJQ==
   dependencies:
-    "@braintree/sanitize-url" "^3.1.0"
+    "@braintree/sanitize-url" "^6.0.0"
     d3 "^7.0.0"
     dagre "^0.8.5"
     dagre-d3 "^0.6.4"
-    dompurify "2.3.5"
+    dompurify "2.3.8"
     graphlib "^2.1.8"
-    khroma "^1.4.1"
+    khroma "^2.0.0"
     moment-mini "^2.24.0"
     stylis "^4.0.10"
 
@@ -8636,11 +8661,6 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
 space-separated-tokens@^1.0.0:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz#85f32c3d10d9682007e917414ddc5c26d1aa6899"
@@ -8937,13 +8957,13 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.1:
     terser "^5.7.2"
 
 terser@^5.10.0, terser@^5.7.2:
-  version "5.12.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.1.tgz#4cf2ebed1f5bceef5c83b9f60104ac4a78b49e9c"
-  integrity sha512-NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ==
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 text-table@^0.2.0: