Skip to content

[18.0-fr7] Preserve user EDPM registry configuration - #2106

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr7from
openshift-cherrypick-robot:cherry-pick-2105-to-18.0-fr7
Sep 24, 2026
Merged

[18.0-fr7] Preserve user EDPM registry configuration#2106
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr7from
openshift-cherrypick-robot:cherry-pick-2105-to-18.0-fr7

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Sep 24, 2026

Copy link
Copy Markdown

This is an automated cherry-pick of #2105

/assign rabi

@rabi @openshift-cherrypick-robot
Preserve user EDPM registry configuration
145676a 
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>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 24, 2026
Merged
@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: 913cf7c2-9379-4019-b0b1-92c94440f4b8

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 fultonj and stuggi September 24, 2026 04:09
@github-actions

github-actions Bot commented Sep 24, 2026

Copy link
Copy Markdown

OpenStackControlPlane CRD Size Report

Metric Value
CRD JSON size 364915 bytes (356KB)
Base branch size 364915 bytes
Change +0.00%
Status yellow — growing
Threshold reference
Color Range Meaning
🟢 green < 300KB Comfortable
🟡 yellow 300–400KB Growing
🟠 orange 400–750KB Concerning
🔴 red > 750KB Approaching 1.5MB etcd limit (cut in half to allow space for update)

@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 92f81cf into openstack-k8s-operators:18.0-fr7 Sep 24, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rabi rabi rabi approved these changes
@fultonj fultonj Awaiting requested review from fultonj
@stuggi stuggi Awaiting requested review from stuggi

Assignees

@rabi rabi

Labels

approved lgtm

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@openshift-cherrypick-robot @rabi