Skip to content

[release-6.7] Log 9591 Do not overwrite ConfigMaps owned by other resources - #3570

Merged
openshift-merge-bot[bot] merged 5 commits into
openshift:release-6.7from
openshift-cherrypick-robot:cherry-pick-3381-to-release-6.7
Nov 5, 2026
Merged

openshift-merge-bot[bot] merged 5 commits into
openshift:release-6.7from
openshift-cherrypick-robot:cherry-pick-3381-to-release-6.7

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #3381

/assign jcantrill

Super User and others added 5 commits November 5, 2026 04:58
Refuse to update an existing ConfigMap when its ownerReferences do not
match the ClusterLogForwarder. This prevents CLO from overwriting
LokiStack (or other) ConfigMaps that share the same name, and surfaces
the conflict as a deployment error on the forwarder.

Co-authored-by: Cursor <cursoragent@cursor.com>
Extend ownership checks beyond ConfigMaps to DaemonSet, Deployment,
Service, ServiceAccount, ServiceMonitor, NetworkPolicy, Role/RoleBinding,
ClusterRoleBinding, and trusted-CA ConfigMap. Shared helper matches owners
by UID and surfaces a clear refuse-to-overwrite error.

Co-authored-by: Cursor <cursoragent@cursor.com>
…wner arguments and UID set comparison for single-owner semantics. CLO resources have one controller owner or none (dashboard).
ClusterRoleBindings are cluster-scoped; namespaced owners (CLF) cannot
own them via ownerReferences. Cleanup remains explicit via delete.

Co-authored-by: Cursor <cursoragent@cursor.com>
Replace UID-set comparison with existing HasSameOwner so ownership
matching uses the same equality logic as the rest of the codebase.

Co-authored-by: Cursor <cursoragent@cursor.com>
@coderabbitai

coderabbitai Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review

@jcantrill

Copy link
Copy Markdown
Contributor

/label tide/merge-method-squash

@openshift-ci openshift-ci Bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Nov 5, 2026
@jcantrill

Copy link
Copy Markdown
Contributor

/approve
/lgtm
/label verified

@openshift-ci openshift-ci Bot added verified Signifies that the PR passed pre-merge verification criteria lgtm Indicates that a PR is ready to be merged. labels Nov 5, 2026
@openshift-ci

openshift-ci Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcantrill, openshift-cherrypick-robot

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

@jcantrill

Copy link
Copy Markdown
Contributor

/test functional-target

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 5, 2026
@openshift-ci

openshift-ci Bot commented Nov 5, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: 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-merge-bot
openshift-merge-bot Bot merged commit 3e11656 into openshift:release-6.7 Nov 5, 2026
9 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. release/6.7 tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants