Skip to content

Commit f77c236

Browse files
authored
[wsman-mk2] Schedule on non experimental nodes (#17481)
* [wsman-mk2] Schedule on non experimental nodes * [wsman-mk2] Remove experimental label from preview nodes
1 parent 9248c1c commit f77c236

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

components/ws-manager-mk2/controllers/create.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,11 @@ func createDefiniteWorkspacePod(sctx *startWorkspaceContext) (*corev1.Pod, error
337337
Key: "gitpod.io/experimental",
338338
Operator: corev1.NodeSelectorOpExists,
339339
})
340+
} else {
341+
matchExpressions = append(matchExpressions, corev1.NodeSelectorRequirement{
342+
Key: "gitpod.io/experimental",
343+
Operator: corev1.NodeSelectorOpDoesNotExist,
344+
})
340345
}
341346

342347
affinity := &corev1.Affinity{

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -627,10 +627,4 @@ leeway run components:add-smith-token \
627627
-DPREVIEW_K3S_KUBE_CONTEXT="${PREVIEW_K3S_KUBE_CONTEXT}" \
628628
-DPREVIEW_NAMESPACE="${PREVIEW_NAMESPACE}"
629629

630-
# Add experimental node label if ws-manager-mk2 is enabled.
631-
# Remove once mk2 workspaces no longer run on experimental nodes.
632-
if [[ "${GITPOD_WSMANAGER_MK2}" == "true" ]]; then
633-
kubectl --kubeconfig "${PREVIEW_K3S_KUBE_PATH}" --context "${PREVIEW_K3S_KUBE_CONTEXT}" --namespace="${PREVIEW_NAMESPACE}" label nodes "${PREVIEW_K3S_KUBE_CONTEXT}" gitpod.io/experimental="true" --overwrite
634-
fi
635-
636630
log_success "Installation is happy: https://${DOMAIN}/workspaces"

0 commit comments

Comments
 (0)