Skip to content

NE-2494: Remove {docs,qe,px}-approved labels from NI&D repositories#80239

Open
Miciah wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:06081632-ne2494-v4
Open

NE-2494: Remove {docs,qe,px}-approved labels from NI&D repositories#80239
Miciah wants to merge 1 commit into
openshift:mainfrom
redhat-chai-bot:06081632-ne2494-v4

Conversation

@Miciah

@Miciah Miciah commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

The no-FF (no-Feature-Freeze) process is no longer used by the Network Ingress & DNS team. Remove the {docs,qe,px}-approved labels from Tide merge queries for the team's repositories:

  • openshift/aws-load-balancer-operator
  • openshift/cluster-dns-operator
  • openshift/cluster-ingress-operator
  • openshift/coredns
  • openshift/external-dns-operator
  • openshift/route-controller-manager
  • openshift/router

For repositories with dual main/master queries (one requiring the approval labels, one without), the approval-label query is removed entirely since it would be a duplicate of the remaining query after the label removal. For repositories with a single query containing these labels, the labels are removed from that query.

Follow-up to #69214, #67715, #34681, #27727, #27247, and #26231.

Summary by CodeRabbit

This PR removes approval label requirements from Prow Tide merge queries for seven Network Ingress & DNS (NI&D) team repositories. The change reflects that these repositories no longer use the no-FF (no-Feature-Freeze) process, which previously required docs-approved, qe-approved, and px-approved labels for automated merges.

Affected Repositories:

  • openshift/aws-load-balancer-operator
  • openshift/cluster-dns-operator
  • openshift/cluster-ingress-operator
  • openshift/coredns
  • openshift/external-dns-operator
  • openshift/route-controller-manager
  • openshift/router

Changes to CI merge criteria:
For repositories with dual queries (one requiring approval labels, one without), the approval-label query is removed entirely to avoid duplication. For repositories with single queries containing these labels, the approval labels are stripped out. The merge criteria now rely on standard labels like approved/lgtm alongside repository-specific requirements (e.g., Jira validation labels).

This simplifies the merge automation by removing the additional approval gate that is no longer needed for these teams' workflows.

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

openshift-ci-robot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

@Miciah: This pull request references NE-2494 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:

The no-FF (no-Feature-Freeze) process is no longer used by the Network Ingress & DNS team. Remove the {docs,qe,px}-approved labels from Tide merge queries for the team's repositories:

  • openshift/aws-load-balancer-operator
  • openshift/cluster-dns-operator
  • openshift/cluster-ingress-operator
  • openshift/coredns
  • openshift/external-dns-operator
  • openshift/route-controller-manager
  • openshift/router

For repositories with dual main/master queries (one requiring the approval labels, one without), the approval-label query is removed entirely since it would be a duplicate of the remaining query after the label removal. For repositories with a single query containing these labels, the labels are removed from that query.

Follow-up to #69214, #67715, #34681, #27727, #27247, and #26231.

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 Jun 8, 2026

Copy link
Copy Markdown
Contributor

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: 2f7e965d-5fc4-41f3-8817-044c33c0c35a

📥 Commits

Reviewing files that changed from the base of the PR and between dcaae87 and f82394b.

📒 Files selected for processing (7)
  • core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/coredns/_prowconfig.yaml
  • core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml
  • core-services/prow/02_config/openshift/router/_prowconfig.yaml
💤 Files with no reviewable changes (7)
  • core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml
  • core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/coredns/_prowconfig.yaml
  • core-services/prow/02_config/openshift/router/_prowconfig.yaml

Walkthrough

This PR updates Prow Tide query configurations across seven OpenShift repositories (aws-load-balancer-operator, cluster-dns-operator, cluster-ingress-operator, coredns, external-dns-operator, route-controller-manager, router) to transition from approval-label-based PR merge gating to JIRA validation labels, simplify main/master branch requirements, and add explicit branch filtering constraints.

Changes

Prow Tide Configuration Migration

Layer / File(s) Summary
JIRA validation label queries
core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml
Repositories transition from docs-approved/px-approved/qe-approved gating to jira/valid-bug and jira/valid-reference validation labels; aws-load-balancer-operator and external-dns-operator split requirements into separate query entries, while route-controller-manager adopts the new labels for a specific query.
Main/master branch query simplifications
core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/coredns/_prowconfig.yaml, core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml, core-services/prow/02_config/openshift/router/_prowconfig.yaml
Queries covering main/master branches reduce label requirements by removing docs-approved and px-approved, and drop keep-main-query-separate from missingLabels, leaving only core approval and JIRA validation labels.
Branch filtering with excludedBranches
core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/router/_prowconfig.yaml
Queries extended with explicit excludedBranches lists that prevent matching against release branches, feature branches, and other targeted patterns, narrowing the scope of automated merge handling.
Release-branch-specific query
core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml
New dedicated query entry added for openshift-4.22/release-4.22 branches with tailored label and missingLabels configuration to handle release-branch merge requirements independently from main/master handling.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Suggested labels

lgtm, approved

Suggested reviewers

  • neisw
  • bradmwilliams
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The PR title clearly and specifically summarizes the main change: removing deprecated approval labels from Tide merge queries across Network Ingress & DNS repositories.
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 modifies only Prow YAML config files in core-services/prow/02_config/, not Go test files. No Ginkgo test definitions present, so test-name stability check is not applicable.
Test Structure And Quality ✅ Passed PR contains only YAML configuration changes for Prow Tide merge queries. The custom check for Ginkgo test structure and quality is not applicable, as no test code is present in this PR.
Microshift Test Compatibility ✅ Passed PR modifies only Prow configuration YAML files (no test code changes). The MicroShift Test Compatibility check applies only when new Ginkgo e2e tests are added; none are present in this PR.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains only Prow config YAML changes, no new Ginkgo e2e tests added. SNO compatibility check is not applicable when no tests are introduced.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only Prow CI configuration files with no deployment manifests, operator code, or scheduling constraints (affinity, topology spread, replicas, nodeSelectors, tolerations, PDBs).
Ote Binary Stdout Contract ✅ Passed PR modifies only YAML Prow configuration files. No Go code, test binaries, or stdout writes are affected. OTE stdout contract check is inapplicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR contains only Prow YAML configuration changes (Tide merge queries), not Ginkgo e2e tests. Custom check for IPv6/disconnected network compatibility in tests is not applicable.
No-Weak-Crypto ✅ Passed All modified files are YAML Prow configuration files with no cryptographic code, weak crypto algorithms, or custom crypto implementations present.
Container-Privileges ✅ Passed PR modifies only Prow Tide configuration files with no Kubernetes manifests or container security settings; check for privileged containers is not applicable.
No-Sensitive-Data-In-Logs ✅ Passed PR modifies only Prow YAML configuration files to remove approval labels from merge queries. No logging code or sensitive data exposure is introduced.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Miciah

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 8, 2026
@openshift-ci openshift-ci Bot requested review from davidesalerno and frobware June 8, 2026 16:47
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 8, 2026
The no-FF (no-Feature-Freeze) process is no longer used by the
Network Ingress & DNS team.  Remove the {docs,qe,px}-approved
labels from Tide merge queries for the team's repositories:

- openshift/aws-load-balancer-operator
- openshift/cluster-dns-operator
- openshift/cluster-ingress-operator
- openshift/coredns
- openshift/external-dns-operator
- openshift/route-controller-manager
- openshift/router

For repositories with dual main/master queries (one requiring the
approval labels, one without), the approval-label query is removed
entirely since it would be a duplicate of the remaining query after
the label removal.  For repositories with a single query containing
these labels, the labels are removed from that query.

https://redhat.atlassian.net/browse/NE-2494

Follow-up to 7dcfe39.
Follow-up to f8ef768.
Follow-up to 34b15ab.
Follow-up to 1559bb3.
Follow-up to 1047530.
Follow-up to 5df39a4.
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@Miciah: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 8, 2026

Copy link
Copy Markdown
Contributor

@Miciah: all tests passed!

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants