integration with ide-proxy

gitpod-io · Aug 5, 2022 · 3de926c · 3de926c
1 parent 18887ca
commit 3de926c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/components/ide-proxy/conf/Caddyfile b/components/ide-proxy/conf/Caddyfile
@@ -1,6 +1,12 @@
 {
 	auto_https off
 	admin off
+	servers {
+		protocol {
+			# gprc service required this, see detail https://github.com/gitpod-io/gitpod/pull/11542#discussion_r937947826
+			allow_h2c
+		}
+	}
 }
 
 (compression) {
@@ -63,7 +69,7 @@
 	}
 
 	@static_path {
-		path /*
+		path /code/* /image/*
 	}
 
 	handle @static_path {
@@ -77,8 +83,16 @@
 		}
 	}
 
+	@metrics_web {
+		path /metrics-api/*
+	}
+
+	handle @metrics_web {
+		reverse_proxy ide-metrics.{$KUBE_NAMESPACE}.{$KUBE_DOMAIN}:3000
+	}
+
 	handle {
-		respond "404 - Not Found" 404
+		reverse_proxy h2c://ide-metrics.{$KUBE_NAMESPACE}.{$KUBE_DOMAIN}:3000
 	}
 }
 

diff --git a/components/ide-proxy/debug.sh b/components/ide-proxy/debug.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+set -Eeuo pipefail
+source /workspace/gitpod/scripts/ws-deploy.sh deployment ide-proxy false
diff --git a/install/installer/pkg/components/proxy/templates/configmap/vhost.ide-proxy.tpl b/install/installer/pkg/components/proxy/templates/configmap/vhost.ide-proxy.tpl
@@ -4,6 +4,6 @@ https://ide.{{.Domain}} {
     import ssl_configuration
 
     reverse_proxy  {
-        to {{.ReverseProxy}}
+        to h2c://{{.ReverseProxy}}
     }
-}
+}