Skip to content

[18-stable] Preserve user EDPM registry configuration - #2105

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18-stablefrom
openshift-cherrypick-robot:cherry-pick-2071-to-18-stable
Sep 24, 2026
Merged

openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18-stablefrom
openshift-cherrypick-robot:cherry-pick-2071-to-18-stable

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #2071

/assign rabi

Sometimes users explicitly set edpm_podman_registries_conf and
edpm_podman_disconnected_ocp to false in OpenStackDataPlaneNodeSet
spec even if cluster has IDMS objects which we assume as disconnected
deployment. Let's give preference to user set ansible vars.

Signed-off-by: rabi <ramishra@redhat.com>
@coderabbitai

coderabbitai Bot commented Sep 24, 2026

Copy link
Copy Markdown

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

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Advanced

Run ID: 1ed190a8-6215-490b-9a04-1a87a2380ed5

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

Comment @coderabbitai help to get the list of available commands.

@openshift-ci
openshift-ci Bot requested review from dprince and rabi September 24, 2026 02:04
@openshift-ci openshift-ci Bot added the lgtm label Sep 24, 2026
@openshift-ci

openshift-ci Bot commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit 745d839 into openstack-k8s-operators:18-stable Sep 24, 2026
6 checks passed
@rabi

rabi commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

/cherry-pick 18.0-fr7

@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@rabi: new pull request created: #2106

Details

In response to this:

/cherry-pick 18.0-fr7

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants