Fixes preview creation after #20833 (#20845)

* [preview] Fix preview creation after k3s update

* [preview] Fix kubectl patch blocking preview creation

Author: geropl

dev/preview/infrastructure/modules/gce/vm.tf

@@ -77,7 +77,8 @@ resource "google_compute_address" "static-preview-ip" {
 locals {
   vm_name = "preview-${var.preview_name}"
   bootstrap_script = templatefile("${path.module}/../../scripts/bootstrap-k3s.sh", {
-    vm_name = local.vm_name
+    vm_name      = local.vm_name
+    preview_name = var.preview_name
   })
 
   trustmanager_script = file("${path.module}/../../scripts/install-trustmanager.sh")

dev/preview/infrastructure/scripts/bootstrap-k3s.sh

@@ -12,6 +12,7 @@ export SERVICE_DNS_IP
 /usr/local/bin/install-k3s.sh \
   --token "1234" \
   --node-ip "$SERVICE_DNS_IP" \
+  --tls-san "${preview_name}.preview.gitpod-dev.com" \
   --node-label "cloud.google.com/gke-nodepool=control-plane-pool" \
   --container-runtime-endpoint=/var/run/containerd/containerd.sock \
   --write-kubeconfig-mode 444 \

dev/preview/workflow/preview/deploy-monitoring-satellite.sh

@@ -97,4 +97,6 @@ echo "Patching grafana deployment"
 kubectl \
     --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" \
     --context "${PREVIEW_K3S_KUBE_CONTEXT}" \
-    patch deployments.apps -n monitoring-satellite grafana --type=json -p="[{'op': 'remove', 'path': '/spec/template/spec/nodeSelector'}]"
+    patch deployments.apps -n monitoring-satellite grafana --type=json \
+    -p='[{"op": "test", "path": "/spec/template/spec/nodeSelector"}, {"op": "remove", "path": "/spec/template/spec/nodeSelector"}]' \
+    2>/dev/null || true