fix: small fixes & examples update

Author: FabianKramm

examples/buildkit-in-cluster/devspace.yaml

@@ -1,29 +1,34 @@
-version: v1beta11
+version: v2beta1
+name: buildkit-in-cluster
+
+# Define an image to use
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
+# Build the dockerfile with buildkit
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      buildKit:
+    buildKit:
         inCluster: {}
+
+# Deploy the built image with helm and the component chart
 deployments:
-  - name: quickstart
+  my-deployment:
+    updateImageTags: true
     helm:
-      componentChart: true
       values:
         containers:
           - image: ${IMAGE}
-        service:
-          ports:
-            - port: 3000
+
+# Is started after images were built and deployments deployed
 dev:
-  ports:
-    - imageSelector: ${IMAGE}
-      forward:
-        - port: 3000
-  sync:
-    - imageSelector: ${IMAGE}
-      excludePaths:
-        - node_modules
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    ports:
+      - port: 3000
+    sync:
+      - path: ./
+        excludePaths:
+          - node_modules

examples/buildkit/devspace.yaml

@@ -1,28 +1,33 @@
-version: v1beta11
+version: v2beta1
+name: buildkit
+
+# Define an image to use
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
+# Build the dockerfile with buildkit
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      buildKit: {}
+    buildKit: {}
+
+# Deploy the built image with helm and the component chart
 deployments:
-  - name: quickstart
+  my-deployment:
+    updateImageTags: true
     helm:
-      componentChart: true
       values:
         containers:
           - image: ${IMAGE}
-        service:
-          ports:
-            - port: 3000
+
+# Is started after images were built and deployments deployed
 dev:
-  ports:
-    - imageSelector: ${IMAGE}
-      forward:
-        - port: 3000
-  sync:
-    - imageSelector: ${IMAGE}
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    ports:
+    - port: 3000
+    sync:
+    - path: ./
       excludePaths:
-        - node_modules
+        - node_modules

examples/custom-builder/devspace.yaml

@@ -1,29 +1,36 @@
 # Note: This example only works in minikube, since the custom builder
 # does not push the image
-version: v1beta11
+version: v2beta1
+name: custom-builder
+
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      custom:
-        skipImageArg: true
-        command: |-
-          # Also works on windows as this is executed in a golang shell
-          docker build -t ${runtime.images.default.image}:${runtime.images.default.tag} . -f custom/Dockerfile
-        onChange:
-        - main.go
+    custom:
+      command: |-
+        # Also works on windows as this is executed in a pseudo shell
+        docker build -t ${runtime.images.my-image.image}:${runtime.images.my-image.tag} . -f custom/Dockerfile
+      onChange:
+      - main.go
+
 deployments:
-- name: devspace-default
-  kubectl:
-    manifests:
-    - kube
+  my-deployment:
+    updateImageTags: true
+    kubectl:
+      manifests:
+      - kube
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    command: ["go", "run", "main.go"]
+    ports:
     - port: 8080
-  sync:
-  - imageSelector: ${IMAGE}
+    sync:
+    - path: ./
+      onUpload:
+        restartContainer: true

examples/dependencies/dependency1/devspace.yaml

@@ -12,6 +12,3 @@ deployments:
     values:
       containers:
       - image: ${IMAGE}
-hooks:
-  - command: "echo 'Hello from dependency1'"
-    events: ["before:build:*"]

examples/dependencies/devspace.yaml

@@ -1,19 +1,16 @@
-version: v1beta11
+version: v2beta1
+
 dependencies:
-- name: dependency1
-  source:
+  dependency1:
     path: dependency1
-- name: dependency2
-  source:
+  dependency2:
     path: dependency2
-  # Use dev.ports config from dependency2
-  dev:
-    ports: true
-- name: dependency3
-  source:
+    pipeline: dev      # Allow ports etc from dependency2
+  dependency3:
     git: https://github.com/devspace-cloud/example-dependency.git
+
 dev:
-  # Open terminal to the pod with the imageName created in dependency1
-  terminal:
-    imageSelector: image(dependency1.default)
+  my-dev:
+    imageSelector: ${runtime.dependencies.dependency1.images.default}
+    terminal: {}
 

examples/hooks/Dockerfile

@@ -1,39 +1,29 @@
-version: v1beta11
+version: v2beta1
+name: hot-reload-container-restart
+
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    # this option tells devspace to automatically wrap the Dockerfile entrypoint in memory
-    # with a small restart helper script so that the process can be easily restarted from within the
-    # container. This should work with most Dockerfiles that have an ENTRYPOINT statement.
-    # This will also work for build targets.
-    # Note: If you override the entrypoint in the kubernetes yaml via the Pod.spec.containers.command,
-    # please make sure you wrap the command with the devspace script '/devspace-restart-helper'
-    injectRestartHelper: true
-    # If you don't have an entrypoint defined in your Dockerfile, you can also define an entrypoint here
-    # entrypoint: ["go"]
-    # cmd: ["run", "main.go"]
+
 deployments:
-- name: quickstart
-  helm:
-    componentChart: true
-    values:
-      containers:
-      - image: ${IMAGE}
-      service:
-        ports:
-        - port: 8080
+  my-deployment:
+    updateImageTags: true
+    helm:
+      values:
+        containers:
+        - image: ${IMAGE}
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
+  my-dev:
+    imageSelector: ${IMAGE}
+    command: ["go", "run", "main.go"] # Needed so that DevSpace knows which command to restart
+    logs: {}
+    ports:
     - port: 8080
-  sync:
-  - imageSelector: ${IMAGE}
-    onUpload:
-      # this option tells devspace to restart the container process if something changes within
-      # the container. This obviously only works if the restart helper script is present in the container.
-      # You can either manually add the restart script or add the injectRestartHelper option to the image
-      restartContainer: true
+    sync:
+    - path: ./
+      onUpload:
+        restartContainer: true

examples/hooks/devspace.yaml

@@ -1,41 +1,27 @@
-version: v1beta11
+version: v2beta1
+name: kaniko
+
 vars:
-  - name: IMAGE
-    value: myuser/myimage
+  IMAGE: myuser/myimage
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    entrypoint: ["sleep"]
-    cmd: ["99999999999999"]
-    build:
-      kaniko: {}
-        # custom kaniko image
-        # image: mykaniko/kaniko:latest
-        # additional mounts for the kaniko pod
-        # additionalMounts:
-        #  - configMap:
-        #      name: test
-        #      items:
-        #        - key: key
-        #          path: config.json
-        #    mountPath: /test/test
-        #  - secret:
-        #      name: test2
-        #      items:
-        #        - key: key
-        #          path: config.json
-        #    mountPath: /test/test
+    kaniko: {}
+
 deployments:
-- name: devspace-default
-  helm:
-    chart:
-      name: ./chart
+  my-deployment:
+    updateImageTags: true
+    helm:
+      values:
+        containers:
+          - image: ${IMAGE}
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
-    - port: 8080
-  sync:
-  - imageSelector: ${IMAGE}
-  terminal:
+  my-dev:
     imageSelector: ${IMAGE}
+    terminal: {}
+    ports:
+    - port: 8080
+    sync:
+    - path: ./

examples/hooks/go.mod

@@ -1,26 +1,26 @@
-version: v1beta11
+version: v2beta1
+
 vars:
-  - name: IMAGE
-    value: localhost:5000/app
+  IMAGE: localhost:5000/app
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
+
 deployments:
-  - name: quickstart
+  my-deployment:
     helm:
-      componentChart: true
       values:
         containers:
           - image: ${IMAGE}
-        service:
-          ports:
-            - port: 3000
+
 dev:
-  ports:
-    - imageSelector: ${IMAGE}
-      forward:
-        - port: 3000
-  sync:
-    - imageSelector: ${IMAGE}
-      excludePaths:
-        - node_modules
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    ports:
+      - port: 3000
+    sync:
+      - path: ./
+        excludePaths:
+          - node_modules

examples/hooks/main.go

@@ -1,24 +1,22 @@
-version: v1beta11
-vars:
-  - name: IMAGE
-    value: yourusername/devspace
-images:
-  default:
-    image: loft-sh/vcluster
+version: v2beta1
+
 deployments:
-- name: devspace-app
-  kubectl:
-    manifests:
-    - kube
-    kustomize: true
+  my-deployment:
+    kubectl:
+      kustomize: true
+      manifests:
+      - kube
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
+  my-dev:
+    labelSelector:
+      app.kubernetes.io/component: default
+    devImage: node:17-alpine
+    terminal: {}
+    workingDir: /app
+    ports:
     - port: 3000
-  sync:
-  - imageSelector: ${IMAGE}
-    excludePaths:
-    - node_modules
-  terminal:
-    imageSelector: ${IMAGE}
+    sync:
+    - path: ./
+      excludePaths:
+      - node_modules

examples/hot-reload-container-restart/devspace.yaml

@@ -1,37 +1,9 @@
-# This example only works with minikube and docker desktop
-# If you want to try this example in other
-# Clusters you have to exchange the image names
-# and enable image pushing
-version: v1beta11
-images:
+version: v2beta1
+
+dependencies:
   node:
-    image: node
-    dockerfile: node/Dockerfile
-    context: node/
+    path: node
+    pipeline: dev
   php:
-    image: php
-    dockerfile: php/Dockerfile
-    context: php/
-deployments:
-- name: devspace-node
-  kubectl:
-    manifests:
-    - node/kube/*
-- name: devspace-php
-  helm:
-    chart:
-      name: php/chart
-dev:
-  ports:
-  - imageSelector: image(node):tag(node)
-    forward:
-    - port: 3000
-  sync:
-  - imageSelector: image(node):tag(node)
-    localSubPath: ./node
-    excludePaths:
-    - node_modules
-  - imageSelector: image(php):tag(php)
-    localSubPath: ./php
-  terminal:
-    imageSelector: image(node):tag(node)
+    path: php
+    pipeline: dev

examples/kaniko/chart/Chart.yaml

@@ -0,0 +1,29 @@
+version: v2beta1
+name: node
+
+vars:
+  IMAGE: myuser/node
+
+images:
+  node:
+    image: ${IMAGE}
+
+deployments:
+  node:
+    updateImageTags: true
+    kubectl:
+      manifests:
+        - kube/*
+
+dev:
+  node:
+    labelSelector:
+      release: devspace-node
+    devImage: ${runtime.images.node}
+    ports:
+      - port: 3000
+    sync:
+      - path: ./
+        excludePaths:
+          - node_modules
+    terminal: {}

examples/kaniko/chart/templates/deployments.yaml

@@ -15,3 +15,4 @@ spec:
       containers:
       - name: node
         image: node
+        imagePullPolicy: Never

examples/kaniko/chart/templates/pod-autoscaling.yaml

@@ -0,0 +1,26 @@
+version: v2beta1
+name: php
+
+vars:
+  IMAGE: myuser/php
+
+images:
+  php:
+    image: ${IMAGE}
+
+deployments:
+  php:
+    updateImageTags: true
+    helm:
+      chart:
+        name: chart
+      values:
+        containers:
+          php:
+            image: ${IMAGE}
+
+dev:
+  php:
+    imageSelector: ${IMAGE}
+    sync:
+      - path: .

examples/kaniko/chart/templates/services.yaml

@@ -108,7 +108,7 @@ func (b *Builder) Build(ctx *devspacecontext.Context) error {
 	}
 
 	// add image arg
-	if b.imageConf.Custom.SkipImageArg == nil || !*b.imageConf.Custom.SkipImageArg {
+	if b.imageConf.Custom.SkipImageArg != nil && !*b.imageConf.Custom.SkipImageArg {
 		for _, tag := range b.imageTags {
 			if b.imageConf.Custom.ImageFlag != "" {
 				args = append(args, b.imageConf.Custom.ImageFlag)
@@ -161,7 +161,8 @@ func (b *Builder) Build(ctx *devspacecontext.Context) error {
 	}
 	defer writer.Close()
 
-	ctx.Log.Infof("Build %s:%s with custom command '%s %s'", b.imageConf.Image, b.imageTags[0], commandPath, strings.Join(args, " "))
+	ctx.Log.Infof("Build %s:%s with custom command", b.imageConf.Image, b.imageTags[0])
+	ctx.Log.Debugf("Build %s:%s with custom command '%s %s' in working dir %s", b.imageConf.Image, b.imageTags[0], commandPath, strings.Join(args, " "), ctx.WorkingDir)
 	if len(args) == 0 {
 		err = engine.ExecuteSimpleShellCommand(ctx.Context, ctx.WorkingDir, writer, writer, nil, nil, commandPath, args...)
 		if err != nil {

examples/kaniko/chart/templates/volumes.yaml

@@ -72,8 +72,9 @@ while ! [ -f $touchFile ]; do
     echo "Container started with restart helper."
     echo "Waiting for initial sync to complete before starting application..."
   else
-    if (( $number % 10 == 0 )); then
+    if [ "$counter" = 10 ]; then
       echo "(Still waiting for initial sync to complete)"
+      counter=0
     fi
   fi
   sleep 1
@@ -107,7 +108,7 @@ while $restart; do
     setsid "$@" &
     pid=$!
     echo "$pid" >"$pidFile"
-    tail --pid=$pid -f /dev/null
+    wait "$pid"
   fi
   set -e
 

examples/kaniko/chart/values.yaml

@@ -203,7 +203,7 @@ fi`,
 		}
 	}
 	if useScreen {
-		newCommand := []string{"screen", "-dRSqL", screenSession}
+		newCommand := []string{"screen", "-dRSqL", screenSession, "--"}
 		newCommand = append(newCommand, command...)
 		command = newCommand
 	}
@@ -212,9 +212,7 @@ fi`,
 
 	before := log.GetBaseInstance().GetLevel()
 	log.GetBaseInstance().SetLevel(logrus.PanicLevel)
-	defer log.GetBaseInstance().SetLevel(before)
-
-	return ctx.KubeClient.ExecStream(ctx.Context, &kubectl.ExecStreamOptions{
+	err := ctx.KubeClient.ExecStream(ctx.Context, &kubectl.ExecStreamOptions{
 		Pod:         container.Pod,
 		Container:   container.Container.Name,
 		Command:     command,
@@ -224,6 +222,12 @@ fi`,
 		Stderr:      stderr,
 		SubResource: kubectl.SubResourceExec,
 	})
+	log.GetBaseInstance().SetLevel(before)
+	if err != nil {
+		ctx.Log.Debugf("error executing stream: %v", err)
+	}
+
+	return err
 }
 
 func IsUnexpectedExitCode(code int) bool {