Skip to content

[18.0-fr6] Resolve InstanceHa container image from ConfigMap before fallback - #642

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr6from
openshift-cherrypick-robot:cherry-pick-641-to-18.0-fr6
Jul 28, 2026
Merged

[18.0-fr6] Resolve InstanceHa container image from ConfigMap before fallback#642
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr6from
openshift-cherrypick-robot:cherry-pick-641-to-18.0-fr6

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #641

/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

@centosinfra-prod-github-app

Copy link
Copy Markdown

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/780d40c3b1b346c4954c8570907aa230

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 38m 07s
podified-multinode-edpm-deployment-crc RETRY_LIMIT in 3m 37s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 44m 23s

@lmiccini

Copy link
Copy Markdown
Contributor

recheck

@openshift-merge-bot
openshift-merge-bot Bot merged commit 011c6b9 into openstack-k8s-operators:18.0-fr6 Jul 28, 2026
7 checks passed
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