OCPBUGS-105786: Revert "Revert "NO-JIRA: Disable WatchList feature gate due to the missing support of Project watch""

[xueqzhan]

Reverts #681

/hold

testing for now. Please ignore.

Summary by CodeRabbit

• Bug Fixes
  • Improved configuration observation reliability by consistently disabling the WatchList feature during observation.
  • Preserved existing feature-gate behavior and error reporting for other supported features.
  • Ensured WatchList is correctly represented among recognized feature gates.

[openshift-merge-bot]

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]

@xueqzhan: This pull request explicitly references no jira issue.

Details

In response to this:

Reverts #681

/hold

testing for now. Please ignore.

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.

[xueqzhan]

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

[openshift-ci]

@xueqzhan: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/45811cc0-95d8-11f1-8d48-8fc9baf84d76-0

[xueqzhan]

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

[openshift-ci]

@xueqzhan: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/47cf0460-95d8-11f1-81e5-bb3713bcedaf-0

[xueqzhan]

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

[openshift-ci]

@xueqzhan: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

• periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/49ef4c50-95d8-11f1-9a5d-d6cfcee4acbb-0

[coderabbitai]

Walkthrough

The configuration observer now wraps its feature-gate accessor. The wrapper forces WatchList off, preserves accessor errors, delegates other feature checks, and ensures WatchList appears in the known-feature list.

Changes

Feature-gate override

Layer / File(s)	Summary
Disable WatchList in the observer accessor pkg/operator/configobservation/configobservercontroller/observe_config_controller.go	The observer imports feature-gate APIs and slice utilities. It wraps the accessor to disable WatchList, preserve errors, delegate other gates, and add WatchList to known features.

Estimated code review effort: 2 (Simple) | ~10 minutes

🚥 Pre-merge checks | ✅ 15

✅ Passed checks (15 passed)

Check name	Status	Explanation
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	The PR changes only one production Go file; the diff adds no Ginkgo test declarations or test titles, so no unstable test name is introduced.
Test Structure And Quality	✅ Passed	The pull request changes only observe_config_controller.go and adds no Ginkgo test code, It blocks, resource setup, waits, or assertions for this check to assess.
Microshift Test Compatibility	✅ Passed	The diff changes only observe_config_controller.go and adds no Ginkgo e2e tests or It/Describe/Context/When declarations; the MicroShift test check is not applicable.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	The patch changes only observe_config_controller.go and adds no Ginkgo e2e tests or It/Describe/Context/When declarations, so SNO test compatibility is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	The diff only wraps feature-gate observation to disable WatchList; it adds no replicas, affinity, topology spread, node selectors, tolerations, or PDB settings.
Ote Binary Stdout Contract	✅ Passed	The diff only adds a WatchList feature-gate wrapper. The changed file has no stdout, fmt, log, klog, or Ginkgo writes, and the OTE main is unchanged.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	The patch changes only controller logic in one Go file; it adds no Ginkgo tests or test paths, so the IPv6/disconnected test check is not applicable.
No-Weak-Crypto	✅ Passed	The only PR change wraps the WatchList feature gate. The added lines contain no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret-comparison logic.
Container-Privileges	✅ Passed	The diff changes only a Go feature-gate wrapper. Added lines contain no privileged:true, hostPID, hostNetwork, hostIPC, SYS_ADMIN, or allowPrivilegeEscalation:true settings.
No-Sensitive-Data-In-Logs	✅ Passed	The only changed file adds a WatchList feature-gate wrapper. The diff adds no logging calls or sensitive data, and downstream events contain only feature-gate names and states.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the change: it restores disabling the WatchList feature gate in the config observer.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Commit unit tests in branch revert-681-revert-667-disable-watchlist

---

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

[coderabbitai]

🧹 Nitpick comments (1)

pkg/operator/configobservation/configobservercontroller/observe_config_controller.go (1)

91-129: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Add focused tests for the feature-gate wrapper.

Test error propagation, WatchList=false, delegation of other gates, and single insertion of WatchList into KnownFeatures. Include a case where the underlying gate does not list WatchList, and verify the observer emits WatchList=false.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In
`@pkg/operator/configobservation/configobservercontroller/observe_config_controller.go`
around lines 91 - 129, Add focused tests for
newFeatureGateAccessWithWatchListDisabled and featureGateWithWatchListDisabled
covering CurrentFeatureGates error propagation, forced WatchList=false,
delegation of non-WatchList gates, and KnownFeatures retaining exactly one
WatchList entry whether or not the underlying gate lists it. Include an
observer-level case with WatchList absent from the underlying gate and verify
the emitted feature gate value is false.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In
`@pkg/operator/configobservation/configobservercontroller/observe_config_controller.go`:
- Around line 91-129: Add focused tests for
newFeatureGateAccessWithWatchListDisabled and featureGateWithWatchListDisabled
covering CurrentFeatureGates error propagation, forced WatchList=false,
delegation of non-WatchList gates, and KnownFeatures retaining exactly one
WatchList entry whether or not the underlying gate lists it. Include an
observer-level case with WatchList absent from the underlying gate and verify
the emitted feature gate value is false.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: bd67ee78-7792-4af9-b7c5-6b0c1377859b

📥 Commits

Reviewing files that changed from the base of the PR and between f730b48 and 1962325.

📒 Files selected for processing (1)

• pkg/operator/configobservation/configobservercontroller/observe_config_controller.go

[openshift-ci-robot]

@xueqzhan: This pull request references Jira Issue OCPBUGS-105786, which is invalid:

• expected the bug to target either version "5.1.0." or "openshift-5.1.0.", but it targets "5.0.0" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Reverts #681

/hold

testing for now. Please ignore.

Summary by CodeRabbit

• Bug Fixes
• Improved configuration observation reliability by consistently disabling the WatchList feature during observation.
• Preserved existing feature-gate behavior and error reporting for other supported features.
• Ensured WatchList is correctly represented among recognized feature gates.

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.

[xueqzhan]

/hold cancel

[xueqzhan]

/jira refresh

[openshift-ci-robot]

@xueqzhan: This pull request references Jira Issue OCPBUGS-105786, which is invalid:

• expected the bug to target only the "5.1.0" version, but multiple target versions were set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

[xueqzhan]

/jira refresh

[openshift-ci-robot]

@xueqzhan: This pull request references Jira Issue OCPBUGS-105786, which is valid.

3 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (5.1.0) matches configured target version for branch (5.1.0)
• bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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.

[jacobsee]

/lgtm
/approve

[openshift-merge-bot]

Scheduling required tests:
/test e2e-aws-operator
/test e2e-aws-ovn
/test e2e-upgrade

[everettraven]

/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: everettraven, jacobsee

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:

• OWNERS [everettraven]

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

[xueqzhan]

/verified by periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

[openshift-ci-robot]

@xueqzhan: This PR has been marked as verified by periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview.

Details

In response to this:

/verified by periodic-ci-openshift-release-main-ci-5.0-e2e-gcp-ovn-techpreview

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.

[openshift-ci]

@xueqzhan: 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.

[openshift-ci-robot]

@xueqzhan: Jira Issue OCPBUGS-105786: Some pull requests linked via external trackers have merged:

The following pull request, linked via external tracker, has not merged:

• openshift/openshift-apiserver#672 is open

All associated pull requests must be merged or unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-105786 has not been moved to the MODIFIED state.

This PR is marked as verified. If the remaining PRs listed above are marked as verified before merging, the issue will automatically be moved to VERIFIED after all of the changes from the PRs are available in an accepted nightly payload.

Details

In response to this:

Reverts #681

/hold

testing for now. Please ignore.

Summary by CodeRabbit

• Bug Fixes
• Improved configuration observation reliability by consistently disabling the WatchList feature during observation.
• Preserved existing feature-gate behavior and error reporting for other supported features.
• Ensured WatchList is correctly represented among recognized feature gates.

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.

[xueqzhan]

/cherry-pick release-5.0

[openshift-cherrypick-robot]

@xueqzhan: new pull request created: #755

Details

In response to this:

/cherry-pick release-5.0

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.