tests/e2e: drop the deprecated KOPS_CONTROL_PLANE_SIZE fallback - #18682
kubernetes-prow[bot] merged 1 commit into
Conversation
KOPS_CONTROL_PLANE_COUNT has been the supported name since kubernetes#15628 (July 2023). Both lib/common.sh and lib/upgrade.sh kept KOPS_CONTROL_PLANE_SIZE working only to print a "Recognized (deprecated) ..." warning before reassigning it, alongside a TODO to switch the callers over. The only callers were the prow jobs, and kubernetes/test-infra#37674 switches all 30 of them to KOPS_CONTROL_PLANE_COUNT, so the fallback and its TODO can go. This must not merge before that test-infra PR: any job still setting only KOPS_CONTROL_PLANE_SIZE would silently fall back to the :-1 default and create a single control plane node instead of three.
|
Skipping CI for Draft Pull Request. |
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hakman The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/override pull-kops-e2e-k8s-gce-ipalias |
|
@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-k8s-gce-ipalias DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
KOPS_CONTROL_PLANE_COUNThas been the supported name since #15628 (July 2023). Since thentests/e2e/scenarios/lib/common.shandtests/e2e/scenarios/lib/upgrade.shhave each carried an identical shim that exists only to warn and reassign:The only callers were the prow jobs. kubernetes/test-infra#37674 switches all 30 of them to
KOPS_CONTROL_PLANE_COUNT, which resolves the TODO and makes both shims dead.The
--control-plane-count/--control-plane-sizeflags themselves are unchanged, as is the${KOPS_CONTROL_PLANE_COUNT:-1}default at each call site.KOPS_CONTROL_PLANE_SIZEno longer appears anywhere in the repo after this.Ordering — this one is not order-independent
Hold until kubernetes/test-infra#37674 merges. Unlike the karpenter pair (#18681 / kubernetes/test-infra#37675), the failure mode here is silent rather than inert: a job that still sets only
KOPS_CONTROL_PLANE_SIZEfalls through to the:-1default and creates a single control plane node instead of three. The affected jobs are the HA upgrade tests, which would keep passing while no longer testing what they are meant to test.That also applies to this PR's own presubmits.
pull-kops-aws-upgrade-*and the-upgrades-dns-nonepresubmits setKOPS_CONTROL_PLANE_SIZEtoday, so until #37674 lands they will exercise this branch with one control plane node. Green presubmits here are not evidence that the ordering is safe./hold
Testing
bash -non both modified scripts.KOPS_CONTROL_PLANE_SIZEhas zero remaining references repo-wide, and that both${KOPS_CONTROL_PLANE_COUNT:-1}call sites are untouched.🤖 Generated with Claude Code