[ws-proxy] Fix workspaceHostSuffix for nodomain,pathAndHost

Author: geropl

chart/config/proxy/lib.locations.conf

@@ -70,6 +70,17 @@ location /apps {
     proxy_pass http://apiserver$request_uri;
 }
 
+##### Blobserve (ingressMode=noDomain,pathAndHost)
+{{- $wsProxy := .Values.components.wsProxy -}}
+{{- if (and $wsProxy (not $wsProxy.disabled)) }}
+location /blobserve {
+    include lib.proxy.conf;
+    include lib.cors-headers.conf;
+
+    proxy_pass http://wsproxy$request_uri;
+}
+{{- end }}
+
 
 ##### Gitpod plugins
 location /plugins {

chart/templates/ws-proxy-configmap.yaml

@@ -77,7 +77,13 @@ data:
             "gitpodInstallation": {
                 "scheme": "{{- template "gitpod.scheme" $this -}}",
                 "hostName": "{{- $gp.hostname -}}",
-                "workspaceHostSuffix": ".{{- if $gp.installation.shortname -}}ws-{{ $gp.installation.shortname }}{{- else -}}ws{{- end -}}.{{- $gp.hostname -}}"
+                {{- if eq .Values.ingressMode "hosts" }}
+                "workspaceHostSuffix":     ".ws{{- if $gp.installation.shortname -}}-{{ $.Values.installation.shortname }}{{- end -}}.{{ $.Values.hostname }}"
+                {{- else if eq .Values.ingressMode "pathAndHost" }}
+                "workspaceHostSuffix":     ""
+                {{- else }}
+                "workspaceHostSuffix":     ""
+                {{- end }}
             },
             "workspacePodConfig": {
                 "serviceTemplate": "http://ws-{{"{{ .workspaceID }}"}}-theia.{{- .Release.Namespace -}}.svc.cluster.local:{{"{{ .port }}"}}",

components/ws-proxy/pkg/proxy/config.go

@@ -92,8 +92,7 @@ func (c *GitpodInstallation) Validate() error {
 
 	return validation.ValidateStruct(c,
 		validation.Field(&c.Scheme, validation.Required),
-		validation.Field(&c.HostName, validation.Required),            // TODO IP ONLY: Check if there is any dependency. If yes, remove it.
-		validation.Field(&c.WorkspaceHostSuffix, validation.Required), // TODO IP ONLY: Check if there is any dependency. If yes, remove it.
+		validation.Field(&c.HostName, validation.Required), // TODO IP ONLY: Check if there is any dependency. If yes, remove it.
 	)
 }