Skip to content

Conversation

@tnierman
Copy link
Member

@tnierman tnierman commented Nov 7, 2025

Reverts logic preventing non-admins from adding the openshift.io/cluster-monitoring label to non-platform namespaces, as this change ultimately proved too disruptive for customers and RH alike.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2025
Co-Authored-By: Claude <noreply@anthropic.com>
@tnierman tnierman force-pushed the revert-cluster-monitoring-label-restriction branch from b3d5c90 to 8ef8df9 Compare November 7, 2025 22:03
@diakovnec
Copy link
Contributor

Hi @tnierman
I've been looking into this and trying to get my head around of what we are trying to achive here and got a bit lost, reading the Slack thread and the previous PRs e.g. 387, 420, 393

Correct me if I am wrong, the goal is to allow non-admins to be able to add/remove/modify the openshift.io/cluster-monitoring label to non-platform namespaces?

@diakovnec
Copy link
Contributor

reached out for clarification in https://redhat-internal.slack.com/archives/C035W96HKN3/p1763355409770629?thread_ts=1761320979.484619&cid=C035W96HKN3

// Check labels.
unauthorized, err := s.unauthorizedLabelChanges(request)
if unauthorized {
if !amIAdmin(request) && unauthorized {
Copy link
Contributor

Choose a reason for hiding this comment

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

I am trying to understand why we add !amIAdmin(request) in this condition. It seems line 186 should already checked amIAdmin(request)? or is there anything specific here?

@coleenquadros
Copy link

Hi is there any update on this? We have regression suites failing due to this change. I had created a PR #436 to add the exception but was told that this restriction would be reverted

@diakovnec
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: diakovnec, tnierman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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
Copy link
Contributor

openshift-ci bot commented Dec 1, 2025

@tnierman: all tests passed!

Full PR test history. Your PR dashboard.

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-merge-bot openshift-merge-bot bot merged commit ecb0220 into openshift:master Dec 1, 2025
8 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. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants