Skip to content

DFBUGS-9938:[release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin - #900

Open
openshift-cherrypick-robot wants to merge 1 commit into
red-hat-storage:release-4.20from
openshift-cherrypick-robot:cherry-pick-868-to-release-4.20
Open

DFBUGS-9938:[release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin#900
openshift-cherrypick-robot wants to merge 1 commit into
red-hat-storage:release-4.20from
openshift-cherrypick-robot:cherry-pick-868-to-release-4.20

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #868

/assign avazeer

The ensureConsolePlugin mutate function unconditionally replaced the
entire spec.proxy list with a hard-coded set of entries. This removed
proxy entries added by other controllers (e.g. ocs-operator's
internalRgwS3 entry), causing an infinite reconcile loop where both
controllers continuously added and removed entries from each other.

Replace the full proxy list assignment with a merge operation that
updates known entries in place while preserving unknown entries
added by other controllers.

Fixes: red-hat-storage#867

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
@openshift-ci

openshift-ci Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign jarrpa 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

@iamniting

Copy link
Copy Markdown
Member

@avazeer @SanjalKatiyar Can you pls attach the bug?

@avazeer

avazeer commented Aug 14, 2026

Copy link
Copy Markdown

/retitle DFBUGS-9938: [release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin

@openshift-ci openshift-ci Bot changed the title [release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin DFBUGS-9938: [release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin Aug 14, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid jira ticket of any type jira/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting labels Aug 14, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 14, 2026

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references [Jira Issue DFBUGS-9938](https://redhat.atlassian.net/browse/DFBUGS-9938), which is invalid:

  • expected the bug to target the "odf-4.20.16" version, but no target version was 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:

This is an automated cherry-pick of #868

/assign avazeer

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.

@iamniting iamniting changed the title DFBUGS-9938: [release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin DFBUGS-9938:[release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin Aug 14, 2026
@iamniting

Copy link
Copy Markdown
Member

@SanjalKatiyar Shall i manually override?

odf-console-6b9d665f48-flt9w                                      0/1     CrashLoopBackOff   6 (2m15s ago)   8m28s

@SanjalKatiyar

Copy link
Copy Markdown
Contributor

@SanjalKatiyar Shall i manually override?

odf-console-6b9d665f48-flt9w                                      0/1     CrashLoopBackOff   6 (2m15s ago)   8m28s

odf-console shouldn't be in error state, is it just a flake ??

TLS changes we did a while ago were for 4.23, there odf-console was expected to fail because changes on build side were needed, but that's not the case here.

@iamniting

Copy link
Copy Markdown
Member

/test odf-operator-e2e-aws

@iamniting

Copy link
Copy Markdown
Member

@SanjalKatiyar Shall i manually override?

odf-console-6b9d665f48-flt9w                                      0/1     CrashLoopBackOff   6 (2m15s ago)   8m28s

odf-console shouldn't be in error state, is it just a flake ??

TLS changes we did a while ago were for 4.23, there odf-console was expected to fail because changes on build side were needed, but that's not the case here.

/opt/app-root/etc/generate_container_user: line 6: /opt/app-root/etc/passwd: Read-only file system
2026/08/14 06:33:21 [emerg] 1#1: "worker_processes" directive is not allowed here in /opt/app-root/etc/nginx.d/nginx.conf:4
nginx: [emerg] "worker_processes" directive is not allowed here in /opt/app-root/etc/nginx.d/nginx.conf:4

This is what i see in the logs, I think we may need 2 images for one for older release and one for newer ones.

@openshift-ci

openshift-ci Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

@openshift-cherrypick-robot: The following test 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/odf-operator-e2e-aws 863472e link true /test odf-operator-e2e-aws

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/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting jira/valid-reference Indicates that this PR references a valid jira ticket of any type

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants