refactor: better dependency handling & new runtime var e2e test

Author: FabianKramm

README.md

@@ -613,7 +613,7 @@ images:
     context: ./db                               # Build with --context=./db
     # The following lines define custom tag schemata for this image
     tags:
-    - devspace-${DEVSPACE_GIT_COMMIT}-######
+    - devspace-${devspace.git.commit}-######
 ```
 Take a look at the documentation for more information about [configuring builds with Docker](https://devspace.sh/cli/docs/configuration/images/docker).  <img src="static/img/line.svg" height="1">
 
@@ -886,7 +886,7 @@ images:
   default:
     image: john/image-name
     tags:
-    - ${DEVSPACE_GIT_COMMIT}-${DEVSPACE_TIMESTAMP}
+    - ${devspace.git.commit}-${devspace.timestamp}
     - latest
 ```
 

cmd/attach.go

@@ -51,7 +51,7 @@ devspace attach -n my-namespace
 
 	attachCmd.Flags().StringVarP(&cmd.Container, "container", "c", "", "Container name within pod where to execute command")
 	attachCmd.Flags().StringVar(&cmd.Pod, "pod", "", "Pod to open a shell to")
-	attachCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, image(app), nginx:tag(app))")
+	attachCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, ${runtime.images.app}, nginx:${runtime.images.app.tag})")
 	attachCmd.Flags().StringVar(&cmd.Image, "image", "", "Image is the config name of an image to select in the devspace config (e.g. 'default'), it is NOT a docker image like myuser/myimage")
 	attachCmd.Flags().StringVarP(&cmd.LabelSelector, "label-selector", "l", "", "Comma separated key=value selector list (e.g. release=test)")
 

cmd/dev.go

@@ -776,7 +776,7 @@ func (cmd *DevCmd) loadConfig(configOptions *loader.ConfigOptions) (config.Confi
 			}
 
 			c.Dev.Terminal = &latest.Terminal{
-				ImageSelector: fmt.Sprintf("image(%s):tag(%s)", imageName, imageName),
+				ImageSelector: fmt.Sprintf("${runtime.images.%s.image}:${runtime.images.%s.tag}", imageName, imageName),
 			}
 		} else {
 			c.Dev.Terminal.Disabled = false

cmd/enter.go

@@ -56,7 +56,7 @@ devspace enter -c my-container
 devspace enter bash -n my-namespace
 devspace enter bash -l release=test
 devspace enter bash --image-selector nginx:latest
-devspace enter bash --image-selector "image(app):tag(app)"
+devspace enter bash --image-selector "${runtime.images.app.image}:${runtime.images.app.tag}"
 #######################################################`,
 		RunE: func(cobraCmd *cobra.Command, args []string) error {
 			plugin.SetPluginCommand(cobraCmd, args)
@@ -68,7 +68,7 @@ devspace enter bash --image-selector "image(app):tag(app)"
 	enterCmd.Flags().StringVar(&cmd.Pod, "pod", "", "Pod to open a shell to")
 	enterCmd.Flags().StringVar(&cmd.Image, "image", "", "Image is the config name of an image to select in the devspace config (e.g. 'default'), it is NOT a docker image like myuser/myimage")
 	enterCmd.Flags().StringVarP(&cmd.LabelSelector, "label-selector", "l", "", "Comma separated key=value selector list (e.g. release=test)")
-	enterCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, image(app), nginx:tag(app))")
+	enterCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, ${runtime.images.app}, nginx:${runtime.images.app.tag})")
 	enterCmd.Flags().StringVar(&cmd.WorkingDirectory, "workdir", "", "The working directory where to open the terminal or execute the command")
 
 	enterCmd.Flags().BoolVar(&cmd.Pick, "pick", true, "Select a pod / container if multiple are found")

cmd/logs.go

@@ -67,7 +67,7 @@ devspace logs --namespace=mynamespace
 	logsCmd.Flags().StringVarP(&cmd.Container, "container", "c", "", "Container name within pod where to execute command")
 	logsCmd.Flags().StringVar(&cmd.Pod, "pod", "", "Pod to print the logs of")
 	logsCmd.Flags().StringVarP(&cmd.LabelSelector, "label-selector", "l", "", "Comma separated key=value selector list (e.g. release=test)")
-	logsCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, image(app), nginx:tag(app))")
+	logsCmd.Flags().StringVar(&cmd.ImageSelector, "image-selector", "", "The image to search a pod for (e.g. nginx, nginx:latest, ${runtime.images.app}, nginx:${runtime.images.app.tag})")
 	logsCmd.Flags().StringVar(&cmd.Image, "image", "", "Image is the config name of an image to select in the devspace config (e.g. 'default'), it is NOT a docker image like myuser/myimage")
 	logsCmd.Flags().BoolVar(&cmd.Pick, "pick", true, "Select a pod")
 	logsCmd.Flags().BoolVarP(&cmd.Follow, "follow", "f", false, "Attach to logs afterwards")

docs/pages/configuration/dependencies/basics.mdx

@@ -117,7 +117,7 @@ dev:
   # Will open a terminal to the pod with the 
   # image from dep1
   terminal:
-    imageName: dep1.image1
+    imageSelector: ${runtime.dependencies.dep1.images.image1}
 ```
 
 With `dep1/devspace.yaml`:
@@ -134,24 +134,9 @@ deployments:
           - image: myusername/devspace
 ```
 
-### Referencing Nested Dependencies
-
-You can also reference nested dependencies (dependencies of dependencies) via:
-```yaml
-dependencies:
-- name: dep1
-  source:
-    path: dep1
-dev:
-  # Will open a terminal to the pod with the 
-  # image from dep2 that is a dependency of dep1
-  terminal:
-    imageName: dep1.dep2.image1
-```
-
 ### Referencing Dependencies in Deployment Values / Manifests
 
-It is also possible to reference a dependency's image with the helpers `image()` or `tag()` in a deployment:
+It is also possible to reference a dependency's image with [runtime variables](../variables/runtime-variables.mdx) in a deployment:
 ```yaml
 dependencies:
 - name: dep1
@@ -163,7 +148,7 @@ deployments:
       componentChart: true
       values:
         containers:
-          - image: image(dep1.image1):tag(dep1.image1) # -> replaced with 'myusername/devspace:xxxx' 
+          - image: ${runtime.dependencies.dep1.image1.image}:${runtime.dependencies.dep1.image1.tag} # -> replaced with 'myusername/devspace:xxxx' 
 ```
 
 With a dependency `dep1/devspace.yaml` that looks like:

docs/pages/configuration/dependencies/local-folder.mdx

@@ -28,7 +28,7 @@ deployments:
     componentChart: true
     values:
       containers:
-        - image: image(component-1.image1):tag(component-1.image1)
+        - image: ${runtime.dependencies.component-1.image1}
 ```
 
 ## `source`

docs/pages/configuration/deployments/helm-charts.mdx

@@ -51,14 +51,12 @@ deployments:
       # If registry.url/repo/image was found under images as well, will be 
       # rewritten to registry.url/repo/image:generated_tag
       imageWithTag: registry.url/repo/image
-      # If registry.url/repo/image was found under images as well, will be
+      # If registry.url/repo/image was found under images.app as well, will be
       # rewritten to registry.url/repo/image
-      imageWithoutTag: image(registry.url/repo/image)
-      # If registry.url/repo/image was found under images as well, will be
+      imageWithoutTag: ${runtime.images.app.image}
+      # If registry.url/repo/image was found under images.app as well, will be
       # rewritten to generated_tag
-      onlyTag: tag(registry.url/repo/image)
-      ingress:
-        enabled: true
+      onlyTag: ${runtime.images.app.tag}
 ```
 
 </TabItem>
@@ -74,14 +72,12 @@ deployments:
       # If registry.url/repo/image was found under images as well, will be
       # rewritten to registry.url/repo/image:generated_tag
       imageWithTag: registry.url/repo/image
-      # If registry.url/repo/image was found under images as well, will be
+      # If registry.url/repo/image was found under images.app as well, will be
       # rewritten to registry.url/repo/image
-      imageWithoutTag: image(registry.url/repo/image)
-      # If registry.url/repo/image was found under images as well, will be
+      imageWithoutTag: ${runtime.images.app.image}
+      # If registry.url/repo/image was found under images.app as well, will be
       # rewritten to generated_tag
-      onlyTag: tag(registry.url/repo/image)
-      ingress:
-        enabled: true
+      onlyTag: ${runtime.images.app.tag}
 ```
 
 </TabItem>
@@ -285,8 +281,6 @@ By default, DevSpace searches all your values (specified via `values` or `values
 
 DevSpace will replace the following things:
 - **registry.url/repo/name** that corresponds to a `images.*.image`, will be rewritten to `registry.url/repo/name:generated_tag`
-- **image(image-key)** that corresponds to a `images.*` key, will be rewritten to `registry.url/repo/name`. You can also use dependency images here with `image(dep1.dep-image)`
-- **tag(image-key)** that corresponds to a `images.*` key, will be rewritten to `generated_tag`. You can also use dependency images here with `tag(dep1.dep-image)`
 
 :::info In-Memory Tag Replacement
 Tag replacement takes place **in-memory** and is **not** writing anything to the filesystem, i.e. it will **never** change any of your configuration files.
@@ -570,3 +564,8 @@ deployments:
     chart:
       name: bitnami/mysql
 ```
+
+## `disabled`
+
+If true, the deployment will not be deployed, rendered or purged. Can be useful in combination with config expressions or command variables.
+

docs/pages/configuration/deployments/kubernetes-manifests.mdx

@@ -143,3 +143,7 @@ deployments:
     - backend/
     - backend-extra/
 ```
+
+## `disabled`
+
+If true, the deployment will not be deployed, rendered or purged. Can be useful in combination with config expressions or command variables.

docs/pages/configuration/deployments/kustomizations.mdx

@@ -143,3 +143,7 @@ deployments:
     - backend/
     - backend-extra/
 ```
+
+## `disabled`
+
+If true, the deployment will not be deployed, rendered or purged. Can be useful in combination with config expressions or command variables.