Skip to content

Fixes preview creation after https://github.com/gitpod-io/gitpod/pull/20833 #20845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 26, 2025
Merged

Fixes preview creation after https://github.com/gitpod-io/gitpod/pull/20833 #20845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caae7ce
[preview] Fix preview creation after k3s update
geropl May 26, 2025
39f1b4a
[preview] Fix kubectl patch blocking preview creation
geropl May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev/preview/infrastructure/modules/gce/vm.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 1 addition & 0 deletions dev/preview/infrastructure/scripts/bootstrap-k3s.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion dev/preview/workflow/preview/deploy-monitoring-satellite.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading