Cherry pick 15115

[petr-balogh]

No description provided.

[petr-balogh]

Verification job triggered here:
https://url.corp.redhat.com/70195fb

[petr-balogh]

I see deployment has passed

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dahorak, petr-balogh, vavuthu

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

Details

Needs approval from an approver in each of these files:

• OWNERS

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

[petr-balogh]

/cherry-pick release-4.20

[openshift-cherrypick-robot]

@petr-balogh: once the present PR merges, I will cherry-pick it on top of release-4.20 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-4.20

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.

[openshift-cherrypick-robot]

@petr-balogh: #15148 failed to apply on top of branch "release-4.20":

Applying: Merge pull request #15115 from shivamdurgbuns/bug/rgwssldeployment_fix
Using index info to reconstruct a base tree...
M	.secrets.baseline
M	conf/README.md
M	ocs_ci/deployment/helpers/external_cluster_helpers.py
M	ocs_ci/ocs/constants.py
M	tests/conftest.py
Falling back to patching base and 3-way merge...
Auto-merging tests/conftest.py
Auto-merging ocs_ci/ocs/constants.py
Auto-merging ocs_ci/deployment/helpers/external_cluster_helpers.py
Auto-merging conf/README.md
Auto-merging .secrets.baseline
CONFLICT (content): Merge conflict in .secrets.baseline
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Merge pull request #15115 from shivamdurgbuns/bug/rgwssldeployment_fix

Details

In response to this:

/cherry-pick release-4.20

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.