Skip to content

[18-stable] Resolve InstanceHa container image from ConfigMap before fallback - #641

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

[18-stable] Resolve InstanceHa container image from ConfigMap before fallback#641
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18-stablefrom
openshift-cherrypick-robot:cherry-pick-634-to-18-stable

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #634

/assign lmiccini

The webhook was always defaulting spec.containerImage, which meant the
controller never reached the ConfigMap lookup path. This made the
infra-instanceha-config ConfigMap (managed by openstack-operator via
OpenStackVersion) effectively dead code.

Remove the ContainerImage webhook defaulting and reorder the resolution
in GetContainerImage() so the priority is:
1. spec.containerImage (explicit user override)
2. infra-instanceha-config ConfigMap (openstack-operator managed)
3. RELATED_IMAGE env var / hardcoded fallback (standalone deployment)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@openshift-ci openshift-ci Bot added the lgtm label Jul 28, 2026
@openshift-ci

openshift-ci Bot commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@lmiccini

Copy link
Copy Markdown
Contributor

/cherry-pick 18.0-fr6

@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@lmiccini: once the present PR merges, I will cherry-pick it on top of 18.0-fr6 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick 18.0-fr6

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-merge-bot
openshift-merge-bot Bot merged commit bc6069e into openstack-k8s-operators:18-stable Jul 28, 2026
5 checks passed
@openshift-cherrypick-robot

Copy link
Copy Markdown
Author

@lmiccini: new pull request created: #642

Details

In response to this:

/cherry-pick 18.0-fr6

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