Skip to content

CNTRLPLANE-3609: graduate etcdBackendQuota to GA#2946

Open
dusk125 wants to merge 1 commit into
openshift:masterfrom
dusk125:etcd-quota-ga
Open

CNTRLPLANE-3609: graduate etcdBackendQuota to GA#2946
dusk125 wants to merge 1 commit into
openshift:masterfrom
dusk125:etcd-quota-ga

Conversation

@dusk125

@dusk125 dusk125 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

No description provided.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 23, 2026
@openshift-ci-robot

openshift-ci-robot commented Jul 23, 2026

Copy link
Copy Markdown

@dusk125: This pull request references CNTRLPLANE-3609 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "5.0.0" version, but no target version was set.

Details

In 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 openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jul 23, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 61b68284-a269-4244-a475-497df6ce7923

📥 Commits

Reviewing files that changed from the base of the PR and between 581cfdf and 6bbd0cd.

📒 Files selected for processing (6)
  • features.md
  • features/features.go
  • payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml
  • payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml
  • payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml
  • payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml

📝 Walkthrough

Walkthrough

Updated the EtcdBackendQuota feature definition with a concrete enhancement reference and enabled it for default and OKD environments. Updated four release FeatureGate manifests to move it from disabled to enabled lists. Relocated its row in the feature-gate defaults table without changing displayed values.

Suggested reviewers: vr4manta, sadasu, davidesalerno

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Description check ❓ Inconclusive No pull request description was provided, so its relevance to the changes cannot be assessed. Add a short description summarizing the feature-gate graduation and manifest updates.
✅ Passed checks (14 passed)
Check name Status Explanation
Title check ✅ Passed The title accurately states the main change: graduating etcdBackendQuota to GA.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed PR only changes docs, feature-gate definitions, and YAML manifests; no Ginkgo test titles or dynamic test names are present in the diff.
Test Structure And Quality ✅ Passed No Ginkgo test files were changed; the PR only touches feature metadata/manifests, so the test-structure checklist is not applicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR only changes feature-gate metadata/manifests, so MicroShift compatibility is not implicated.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo test files or It/Describe/Context additions were changed; only feature-gate metadata/manifests were updated.
Topology-Aware Scheduling Compatibility ✅ Passed Touched files only update EtcdBackendQuota feature-gate metadata and enabled lists; no topology-sensitive scheduling logic or constraints were added.
Ote Binary Stdout Contract ✅ Passed PR only changes feature-gate metadata/YAML; no main/init/TestMain/BeforeSuite code or stdout writes appear in the touched files.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR only changes feature-gate metadata and manifests, so IPv4/disconnected-network compatibility is not applicable.
No-Weak-Crypto ✅ Passed Touched files only update feature-gate metadata/manifests; targeted scan found no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or custom-crypto code.
Container-Privileges ✅ Passed Diff only updates EtcdBackendQuota feature-gate lists/metadata; no privileged, hostPID/Network/IPC, SYS_ADMIN, or allowPrivilegeEscalation settings appear.
No-Sensitive-Data-In-Logs ✅ Passed Touched files only update feature-gate metadata/manifests; no log calls or sensitive-data strings appear in the changed hunks.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 Checkov (3.3.8)
payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'

payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'

payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml

Traceback (most recent call last):
File "/usr/local/bin/checkov", line 2, in
from checkov.main import Checkov
ModuleNotFoundError: No module named 'checkov'

  • 1 others
🔧 golangci-lint (2.12.2)

Error: build linters: unable to load custom analyzer "kubeapilinter": tools/_output/bin/kube-api-linter.so, plugin: not implemented
The command is terminated due to an error: build linters: unable to load custom analyzer "kubeapilinter": tools/_output/bin/kube-api-linter.so, plugin: not implemented


Comment @coderabbitai help to get the list of available commands.

@dusk125

dusk125 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor Author

/cc @atiratree @bhperry

@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

Hello @dusk125! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci
openshift-ci Bot requested review from atiratree and bhperry July 23, 2026 14:30
@qodo-for-rh-openshift

Copy link
Copy Markdown

PR Summary by Qodo

Graduate EtcdBackendQuota feature gate to GA defaults

✨ Enhancement 📝 Documentation ⚙️ Configuration changes 🕐 10-20 Minutes

Grey Divider

AI Description

• Promote EtcdBackendQuota to GA by enabling it in default and OKD profiles.
• Replace placeholder enhancement reference with the actual enhancement PR link.
• Update feature gate manifests and docs to reflect GA availability for 4.10 payloads.
Diagram

graph TD
  A(("EtcdBackendQuota")) --> B["features/features.go"] --> C["payload 4.10 featureGate YAMLs"]
  B --> D["features.md"]
  C --> E(("Hypershift 4.10"))
  C --> F(("SelfManagedHA 4.10"))
Loading
High-Level Assessment

The following are alternative approaches to this PR:

1. Remove the feature gate entirely (treat as unconditional behavior)
  • ➕ Eliminates long-term overhead of maintaining GA gates and payload lists
  • ➕ Avoids confusion about whether the behavior can be disabled
  • ➖ Not always feasible: consumers may still rely on the gate for rollback/compat policy
  • ➖ Requires broader coordination and potentially code changes outside this repo
2. Enable only in Default first, then follow-up to OKD
  • ➕ More conservative rollout if there’s concern about OKD parity/variance
  • ➖ Extends the mixed-state period and increases matrix/testing burden
  • ➖ This PR already indicates readiness for GA across Default and OKD

Recommendation: The PR’s approach (enable inDefault + inOKD while keeping previews, and update the enhancement link and manifests/docs) is the right incremental step for graduating to GA without introducing behavioral code churn here. If future policy allows, consider a separate follow-up to evaluate whether the gate can be retired entirely once GA has baked sufficiently.

Files changed (6) +16 / -16

Enhancement (1) +3 / -3
features.goEnable EtcdBackendQuota in Default/OKD and link real enhancement PR +3/-3

Enable EtcdBackendQuota in Default/OKD and link real enhancement PR

• Replaces the legacy/placeholder enhancement PR reference with https://github.com/openshift/enhancements/pull/2031. Expands the enablement set to include inDefault() and inOKD() in addition to the existing preview/upgrade-restricted profiles.

features/features.go

Documentation (1) +1 / -1
features.mdMove EtcdBackendQuota to GA section in feature matrix +1/-1

Move EtcdBackendQuota to GA section in feature matrix

• Repositions the EtcdBackendQuota row from the earlier table section into the later section that represents GA/default availability, keeping it marked as enabled across columns.

features.md

Other (4) +12 / -12
featureGate-4-10-Hypershift-Default.yamlPromote EtcdBackendQuota within Hypershift Default 4.10 manifest list +3/-3

Promote EtcdBackendQuota within Hypershift Default 4.10 manifest list

• Removes EtcdBackendQuota from the earlier segment of the enabled list and re-adds it in the GA/default grouping near other default-enabled gates (around EVPN/EventTTL).

payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml

featureGate-4-10-Hypershift-OKD.yamlPromote EtcdBackendQuota within Hypershift OKD 4.10 manifest list +3/-3

Promote EtcdBackendQuota within Hypershift OKD 4.10 manifest list

• Mirrors the Hypershift Default adjustment: EtcdBackendQuota is relocated to the GA/default grouping of the enabled feature gate list.

payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml

featureGate-4-10-SelfManagedHA-Default.yamlPromote EtcdBackendQuota within SelfManagedHA Default 4.10 manifest list +3/-3

Promote EtcdBackendQuota within SelfManagedHA Default 4.10 manifest list

• Relocates EtcdBackendQuota from the earlier portion of the list to the GA/default grouping alongside other default-enabled gates.

payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-Default.yaml

featureGate-4-10-SelfManagedHA-OKD.yamlPromote EtcdBackendQuota within SelfManagedHA OKD 4.10 manifest list +3/-3

Promote EtcdBackendQuota within SelfManagedHA OKD 4.10 manifest list

• Relocates EtcdBackendQuota to the GA/default grouping in the OKD SelfManagedHA 4.10 feature gate manifest list.

payload-manifests/featuregates/featureGate-4-10-SelfManagedHA-OKD.yaml

@openshift-ci openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 23, 2026
@openshift-ci
openshift-ci Bot requested review from JoelSpeed and everettraven July 23, 2026 14:35
@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign deads2k for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@qodo-for-rh-openshift

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (2) 📘 Rule violations (0) 📜 Skill insights (0)

Context used
✅ Compliance rules (platform): 29 rules
✅ Skills: api-review

Grey Divider


Action required

1. No CRDs for tests 🐞 Bug ☼ Reliability
Description
EtcdBackendQuota is now enabled for all shipped feature sets (Default/OKD/TechPreview/DevPreview),
but etcd API validation suites still require it disabled ("-EtcdBackendQuota"), causing the suite
loader to find zero matching CRD manifests and abort. This breaks
operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml and HardwareSpeed.yaml selection via
tests/crd_filter.go filtering logic.
Code

features/features.go[R225-226]

+					enhancementPR("https://github.com/openshift/enhancements/pull/2031").
+					enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
Relevance

⭐⭐⭐ High

Deterministic test selection break (zero CRDs) after gate graduation; teams usually fix CI-blocking
suite loader issues.

PR-#2637

ⓘ Recommendations generated based on similar findings in past PRs

Evidence
Both etcd suites explicitly require the gate disabled, but the payload featuregate manifests show
EtcdBackendQuota enabled for Default/OKD and it is also enabled in TechPreview/DevPreview;
tests/crd_filter.go will therefore exclude all CRDs when a required-disabled gate is actually
enabled, leaving no CRD files for the suite.

operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml[2-18]
operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml[2-41]
tests/crd_filter.go[41-129]
payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml[291-340]
payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml[315-334]
payload-manifests/featuregates/featureGate-4-10-Hypershift-DevPreviewNoUpgrade.yaml[191-230]
payload-manifests/featuregates/featureGate-4-10-Hypershift-TechPreviewNoUpgrade.yaml[206-245]

Agent prompt
The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
Etcd API validation suites for etcd still require `-EtcdBackendQuota`, but the PR enables `EtcdBackendQuota` in Default/OKD (and it is already enabled in DevPreview/TechPreview). The test generator filters CRDs based on payload featuregate enablement; after this PR there are no matching CRD manifests where the gate is disabled, so suite loading fails.

### Issue Context
- `AAA_ungated.yaml` and `HardwareSpeed.yaml` are currently pinned to run only when `EtcdBackendQuota` is disabled.
- After GA graduation, the gate is enabled everywhere; the tests should become ungated (remove the `featureGates` constraint) or be rewritten to target the correct (now-unconditional) schema.

### Fix Focus Areas
- operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml[2-18]
- operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml[2-41]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


2. CRDs not regenerated 🐞 Bug ≡ Correctness
Description
The payload featuregate manifests now enable EtcdBackendQuota for Default/OKD, but the checked-in
generated etcd CRDs for those feature sets still omit spec.backendQuotaGiB, so the GA field is not
actually present in the Default/OKD structural schemas. This creates a mismatch where featuregate
configuration says the gate is enabled but the shipped CRD schema doesn’t include the gated field
(contrast with DevPreview/TechPreview CRDs which do include it).
Code

payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml[R322-324]

+                    {
+                        "name": "EtcdBackendQuota"
+                    },
Relevance

⭐⭐⭐ High

Repo typically updates zz_generated.crd-manifests alongside featuregate/maturity changes; mismatch
would be treated as a correctness bug.

PR-#2679
PR-#2861
PR-#2519

ⓘ Recommendations generated based on similar findings in past PRs

Evidence
Default payload featuregates now list EtcdBackendQuota as enabled, but the generated etcd CRD for
the Default feature-set still lacks any backendQuotaGiB schema entry, while the DevPreviewNoUpgrade
CRD contains backendQuotaGiB with default/validations—indicating the repo wasn’t regenerated/updated
for Default/OKD after enabling the gate.

payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml[291-340]
features/features.go[221-227]
operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml[36-80]
operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-DevPreviewNoUpgrade.crd.yaml[45-69]

Agent prompt
The issue below was found during a code review. Follow the provided context and guidance below and implement a solution

### Issue description
After enabling `EtcdBackendQuota` in Default/OKD feature sets, the generated CRD manifests for etcd in those feature sets must include the gated `spec.backendQuotaGiB` field (and its default/validation). The repo currently has Default/OKD etcd CRDs that still lack this field.

### Issue Context
- The DevPreviewNoUpgrade CRD already contains `backendQuotaGiB`, demonstrating the partial schema exists and merges when the gate is enabled.
- Default/OKD etcd CRD manifests should now match that schema inclusion.

### Fix Focus Areas
- operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml[35-120]
- operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-OKD.crd.yaml[1-120]
- payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml[291-340]
- payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml[315-334]
- features/features.go[221-227]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools


Grey Divider

Qodo Logo

Comment thread features/features.go
Comment on lines +225 to +226
enhancementPR("https://github.com/openshift/enhancements/pull/2031").
enable(inDefault(), inOKD(), inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Action required

1. No crds for tests 🐞 Bug ☼ Reliability

EtcdBackendQuota is now enabled for all shipped feature sets (Default/OKD/TechPreview/DevPreview),
but etcd API validation suites still require it disabled ("-EtcdBackendQuota"), causing the suite
loader to find zero matching CRD manifests and abort. This breaks
operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml and HardwareSpeed.yaml selection via
tests/crd_filter.go filtering logic.
Agent Prompt
### Issue description
Etcd API validation suites for etcd still require `-EtcdBackendQuota`, but the PR enables `EtcdBackendQuota` in Default/OKD (and it is already enabled in DevPreview/TechPreview). The test generator filters CRDs based on payload featuregate enablement; after this PR there are no matching CRD manifests where the gate is disabled, so suite loading fails.

### Issue Context
- `AAA_ungated.yaml` and `HardwareSpeed.yaml` are currently pinned to run only when `EtcdBackendQuota` is disabled.
- After GA graduation, the gate is enabled everywhere; the tests should become ungated (remove the `featureGates` constraint) or be rewritten to target the correct (now-unconditional) schema.

### Fix Focus Areas
- operator/v1/tests/etcds.operator.openshift.io/AAA_ungated.yaml[2-18]
- operator/v1/tests/etcds.operator.openshift.io/HardwareSpeed.yaml[2-41]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

Comment on lines +322 to +324
{
"name": "EtcdBackendQuota"
},

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Action required

2. Crds not regenerated 🐞 Bug ≡ Correctness

The payload featuregate manifests now enable EtcdBackendQuota for Default/OKD, but the checked-in
generated etcd CRDs for those feature sets still omit spec.backendQuotaGiB, so the GA field is not
actually present in the Default/OKD structural schemas. This creates a mismatch where featuregate
configuration says the gate is enabled but the shipped CRD schema doesn’t include the gated field
(contrast with DevPreview/TechPreview CRDs which do include it).
Agent Prompt
### Issue description
After enabling `EtcdBackendQuota` in Default/OKD feature sets, the generated CRD manifests for etcd in those feature sets must include the gated `spec.backendQuotaGiB` field (and its default/validation). The repo currently has Default/OKD etcd CRDs that still lack this field.

### Issue Context
- The DevPreviewNoUpgrade CRD already contains `backendQuotaGiB`, demonstrating the partial schema exists and merges when the gate is enabled.
- Default/OKD etcd CRD manifests should now match that schema inclusion.

### Fix Focus Areas
- operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-Default.crd.yaml[35-120]
- operator/v1/zz_generated.crd-manifests/0000_12_etcd_01_etcds-OKD.crd.yaml[1-120]
- payload-manifests/featuregates/featureGate-4-10-Hypershift-Default.yaml[291-340]
- payload-manifests/featuregates/featureGate-4-10-Hypershift-OKD.yaml[315-334]
- features/features.go[221-227]

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

@dusk125: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/verify-hypershift-integration 6bbd0cd link true /test verify-hypershift-integration
ci/prow/integration 6bbd0cd link true /test integration
ci/prow/verify 6bbd0cd link true /test verify
ci/prow/verify-feature-promotion 6bbd0cd link true /test verify-feature-promotion

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants