Repository navigation
Rename --cordon-control-plane to --cordon-system-infra-components and its node pool label to ate-system-infra - #3210
Merged
Tim Hockin (thockin) merged 3 commits intoOct 27, 2026
Conversation
haiyanmeng
force-pushed
the
rename-cordon
branch
from
October 26, 2026 16:35
a1b037b to
f52a4d3
Compare
haiyanmeng
force-pushed
the
rename-cordon
branch
from
October 26, 2026 17:15
f52a4d3 to
ede7198
Compare
haiyanmeng
marked this pull request as ready for review
October 26, 2026 17:46
haiyanmeng
requested review from
Bowei Du (bowei),
Julian Gutierrez Oschmann (juli4n) and
Max Smythe (maxsmythe)
October 26, 2026 17:46
Max Smythe (maxsmythe)
previously approved these changes
Oct 26, 2026
Max Smythe (maxsmythe)
left a comment
Collaborator
There was a problem hiding this comment.
LGTM, but needs approval for slush exception (not pure docs/test change)
haiyanmeng
requested review from
Benjamin Elder (BenTheElder) and
Eitan Yarmush (EItanya)
October 26, 2026 17:54
Julian Gutierrez Oschmann (juli4n)
previously approved these changes
Oct 27, 2026
haiyanmeng
dismissed stale reviews from Julian Gutierrez Oschmann (juli4n) and Max Smythe (maxsmythe)
via
October 27, 2026 18:42
9a4b40d
haiyanmeng
force-pushed
the
rename-cordon
branch
from
October 27, 2026 18:42
06c418d to
9a4b40d
Compare
Collaborator
Author
|
Rebased the PR to resolve merge conflict. |
…ponents The flag also pins atenet-router and atenet-egress, which are data plane components, so "control plane" misnamed what it cordons. The env var, setting key and kustomize component are renamed to match, and the shared node pool label ate.dev/workloadType=ate-control-plane becomes ate.dev/workloadType=ate-system-infra. Installs that use the flag must relabel and retaint the shared pool before they redeploy. Otherwise the new pods stay Pending. Signed-off-by: Haiyan Meng <[email protected]>
Say system infra in the cordon component comment, rewrap the size10 postgres comment, and note that the postgres pool goes in the zone of its volume. Signed-off-by: Haiyan Meng <[email protected]>
hack/install-ate.sh only forwards to cmd/ate-setup, so ate-setup alone selects the component. Signed-off-by: Haiyan Meng <[email protected]>
haiyanmeng
force-pushed
the
rename-cordon
branch
from
October 27, 2026 19:11
9a4b40d to
2a18fd4
Compare
Collaborator
Author
|
Ran |
Collaborator
|
I don't love "system-infra" just for being long, but whatever. "sysinfra" might have been sufficient. :) Approving |
Tim Hockin (thockin)
enabled auto-merge
October 27, 2026 22:47
Tim Hockin (thockin)
approved these changes
Oct 27, 2026
Collaborator
Author
Naming is hard. Thanks for the review and approval. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
--cordon-control-planealso pins atenet-router and atenet-egress, which are data plane components, so the name is confusing.Renamed:
--cordon-control-plane--cordon-system-infra-componentsATE_INSTALL_CORDON_CONTROL_PLANEATE_INSTALL_CORDON_SYSTEM_INFRA_COMPONENTScordonControlPlane(config file key)cordonSystemInfraComponentsate.dev/workloadType=ate-control-plane(shared pool label and taint)ate.dev/workloadType=ate-system-inframanifests/ate-install/components/cordon-control-planemanifests/ate-install/components/cordon-system-infra-componentsThe postgres pool label
ate.dev/workloadType=ate-postgresis unchanged.The missing postgres pool error linked to
docs/upgrade.md#cordoned-control-plane-postgres-pool, which doesn't exist. It now links to the System Infra Isolation section indocs/architecture.md.AI use: I used Claude Code to make the rename and update the docs and comments, and I reviewed the diff.
Breaking change
Installs that don't use
--cordon-control-planeneed no action.Installs that do:
Replace the old flag, env var or config file key with the new one in your scripts and config. The old flag and config key fail with an error. The old env var is ignored silently, and the install would stop cordoning.
Relabel and retaint the shared pool from
ate-control-planetoate-system-infra. Running pods keep running, because node selectors andNoScheduletaints only apply at scheduling. On GKE:Both flags replace the pool's whole set of labels or taints, so include any others the pool carries. gcloud asks for confirmation. Add
--quietto skip it. GKE updates the existing nodes in place.On other providers, update the pool's node template the same way. For nodes labeled by hand, overwrite the label and taint in place:
Don't remove the old taint before adding the new one. While the node has no taint, DaemonSets such as atelet schedule pods onto it.
Redeploy with
ate-setup deploy ate-system --cordon-system-infra-components. The new pods schedule onto the relabeled pool.Do steps 2 and 3 close together. A system infra pod rescheduled between them stays Pending until step 3.