Sitelet https://github.com/kubernetes/kops/pull/18682
Skip to content

tests/e2e: drop the deprecated KOPS_CONTROL_PLANE_SIZE fallback - #18682

Merged
kubernetes-prow[bot] merged 1 commit into
kubernetes:masterfrom
rifelpet:drop-deprecated-control-plane-size
Aug 13, 2026
Merged

kubernetes-prow[bot] merged 1 commit into
kubernetes:masterfrom
rifelpet:drop-deprecated-control-plane-size

Conversation

@rifelpet

Copy link
Copy Markdown
Member

KOPS_CONTROL_PLANE_COUNT has been the supported name since #15628 (July 2023). Since then tests/e2e/scenarios/lib/common.sh and tests/e2e/scenarios/lib/upgrade.sh have each carried an identical shim that exists only to warn and reassign:

# TODO: Switch scripts to use KOPS_CONTROL_PLANE_COUNT
if [[ -n "${KOPS_CONTROL_PLANE_SIZE:-}" ]]; then
    echo "Recognized (deprecated) KOPS_CONTROL_PLANE_SIZE=${KOPS_CONTROL_PLANE_SIZE}, please set KOPS_CONTROL_PLANE_COUNT instead"
    KOPS_CONTROL_PLANE_COUNT=${KOPS_CONTROL_PLANE_SIZE}
fi

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-size flags themselves are unchanged, as is the ${KOPS_CONTROL_PLANE_COUNT:-1} default at each call site. KOPS_CONTROL_PLANE_SIZE no 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_SIZE falls through to the :-1 default 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-none presubmits set KOPS_CONTROL_PLANE_SIZE today, 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 -n on both modified scripts.
  • Verified KOPS_CONTROL_PLANE_SIZE has zero remaining references repo-wide, and that both ${KOPS_CONTROL_PLANE_COUNT:-1} call sites are untouched.

🤖 Generated with Claude Code

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.
@kubernetes-prow

Copy link
Copy Markdown
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@kubernetes-prow kubernetes-prow Bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 12, 2026
@kubernetes-prow
kubernetes-prow Bot requested review from olemarkus and zetaab August 12, 2026 22:06
@rifelpet
rifelpet marked this pull request as ready for review August 12, 2026 22:07
@kubernetes-prow kubernetes-prow Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 12, 2026
@kubernetes-prow
kubernetes-prow Bot requested a review from hakman August 12, 2026 22:10
@hakman

hakman commented Aug 13, 2026

Copy link
Copy Markdown
Member

/lgtm
/unhold

@kubernetes-prow kubernetes-prow Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 13, 2026
@kubernetes-prow kubernetes-prow Bot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2026
@hakman

hakman commented Aug 13, 2026

Copy link
Copy Markdown
Member

/approve

@kubernetes-prow

Copy link
Copy Markdown
Contributor

[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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubernetes-prow kubernetes-prow Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 13, 2026
@hakman

hakman commented Aug 13, 2026

Copy link
Copy Markdown
Member

/override pull-kops-e2e-k8s-gce-ipalias

@kubernetes-prow

Copy link
Copy Markdown
Contributor

@hakman: Overrode contexts on behalf of hakman: pull-kops-e2e-k8s-gce-ipalias

Details

In response to this:

/override pull-kops-e2e-k8s-gce-ipalias

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.

@kubernetes-prow
kubernetes-prow Bot merged commit f758b17 into kubernetes:master Aug 13, 2026
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants