DFBUGS-9938:[release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin - #900
Conversation
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>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: openshift-cherrypick-robot The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@avazeer @SanjalKatiyar Can you pls attach the bug? |
|
/retitle DFBUGS-9938: [release-4.20] controllers: fix ConsolePlugin proxy entries overwrite in ensureConsolePlugin |
|
@openshift-cherrypick-robot: This pull request references [Jira Issue DFBUGS-9938](https://redhat.atlassian.net/browse/DFBUGS-9938), which is invalid:
Comment DetailsIn response to this:
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. |
|
@SanjalKatiyar Shall i manually override? |
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. |
|
/test odf-operator-e2e-aws |
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-cherrypick-robot: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
This is an automated cherry-pick of #868
/assign avazeer