Speed up edit-compile-run loop for workspace components

components/blobserve/debug.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment blobserve

components/content-service/debug.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment content-service

components/ee/agent-smith/debug.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh daemonset agent-smith

components/image-builder-mk3/debug.sh

@@ -1,19 +1,7 @@
 #!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
 
-# This script builds the image builder and replaces the current deployment with it.
-
-docker ps &> /dev/null || (echo "You need a working Docker daemon. Maybe set DOCKER_HOST?"; exit 1)
-gcloud auth list | grep typefox &>/dev/null || (echo "Login using 'gcloud auth login' for the docker push to work"; exit 1)
-
-
-readonly tag
-tag="dev-$(date +%s)"
-leeway build -v .:docker -Dversion="${tag}" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/build
-devImage="eu.gcr.io/gitpod-core-dev/build/image-builder-mk3:${tag}"
-
-kubectl patch deployment image-builder-mk3 --patch '{"spec": {"template": {"spec": {"containers": [{"name": "image-builder-mk3","imagePullPolicy":"Always","image": "'"$devImage"'"}]}}}}'
-kubectl rollout restart deployment/image-builder-mk3
-kubectl rollout status -w deployment/image-builder-mk3
-# give the old pod time to disappear
-sleep 20
-gpctl debug logs image-builder-mk3
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment image-builder-mk3

components/registry-facade/debug.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh daemonset registry-facade

components/ws-daemon/debug.sh

@@ -1,21 +1,4 @@
 #!/bin/bash
 
-# ws-daemon runs as daemonset on each node which renders telepresence useless for debugging.
-# This script builds ws-daemon locally, puts it in a Dockerfile, builds the image, pushes it,
-# patches the daemonset and restarts all pods.
-#
-# This way you can test out your changes with a 30 sec turnaround.
-#
-# BEWARE: the properly built version of ws-daemon may behave differently.
-
 set -Eeuo pipefail
-
-docker ps &> /dev/null || (echo "You need a working Docker daemon. Maybe set DOCKER_HOST?"; exit 1)
-
-version=dev-0
-leeway build .:docker -Dversion="$version" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev
-devImage=eu.gcr.io/gitpod-core-dev/dev/ws-daemon:"$version"
-
-kubectl set image daemonset ws-daemon ws-daemon="$devImage"
-kubectl annotate daemonset ws-daemon kubernetes.io/change-cause="$version"
-kubectl rollout restart daemonset ws-daemon
+source /workspace/gitpod/scripts/ws-deploy.sh daemonset ws-daemon

components/ws-manager/debug.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+
+source /workspace/gitpod/scripts/ws-deploy.sh deployment ws-manager

components/ws-proxy/debug.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment ws-proxy false

scripts/ws-deploy.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the GNU Affero General Public License (AGPL).
+# See License-AGPL.txt in the project root for license information.
+
+# This script builds a workspace component and updates the cluster
+
+set -Eeuo pipefail
+
+resource_type=$1
+resource_name=$2
+enable_debug=${3:-true}
+version="dev-$(date +%F_T"%H-%M-%S")"
+dev_image=eu.gcr.io/gitpod-core-dev/dev/$resource_name:"$version"
+
+docker ps &> /dev/null || (echo "You need a working Docker daemon. Maybe set DOCKER_HOST?"; exit 1)
+leeway build .:docker -Dversion="$version" -DimageRepoBase=eu.gcr.io/gitpod-core-dev/dev
+
+kubectl set image "$resource_type" "$resource_name" "$resource_name"="$dev_image"
+kubectl rollout restart "$resource_type" "$resource_name"
+kubectl annotate "$resource_type" "$resource_name" kubernetes.io/change-cause="$version"
+kubectl rollout status -w "$resource_type" "$resource_name"
+
+while kubectl get pods -l component="$resource_name" | grep -q Terminating;
+do
+    echo "Waiting for old pods to terminate"
+    sleep 3
+done
+if [[ "$enable_debug" = true ]]; then
+    gpctl debug logs "$resource_name" > /dev/null
+fi