Skip to content

Resolve InstanceHa container image from ConfigMap before fallback - #634

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
lmiccini:instanceha-image-configmap-priority
Jul 28, 2026
Merged

Resolve InstanceHa container image from ConfigMap before fallback#634
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
lmiccini:instanceha-image-configmap-priority

Conversation

@lmiccini

@lmiccini lmiccini commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

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)

Jira: https://redhat.atlassian.net/browse/OSPRH-33358

@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/f2f0f8334d58476e83a5fb0bad103c69

openstack-k8s-operators-content-provider FAILURE in 10m 46s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

@lmiccini

Copy link
Copy Markdown
Contributor Author

recheck

@lmiccini

Copy link
Copy Markdown
Contributor Author

/test infra-operator-build-deploy-kuttl

1 similar comment
@lmiccini

Copy link
Copy Markdown
Contributor Author

/test infra-operator-build-deploy-kuttl

Comment thread internal/controller/instanceha/instanceha_controller.go Outdated
Comment thread internal/controller/instanceha/instanceha_controller.go Outdated
Comment thread apis/instanceha/v1beta1/instanceha_webhook.go
@lmiccini
lmiccini force-pushed the instanceha-image-configmap-priority branch from d95be1b to 71a3112 Compare July 27, 2026 06:49
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>
@lmiccini
lmiccini force-pushed the instanceha-image-configmap-priority branch from 71a3112 to c44045c Compare July 27, 2026 07:01
@lmiccini

Copy link
Copy Markdown
Contributor Author

/test infra-operator-build-deploy-kuttl

@stuggi stuggi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci

openshift-ci Bot commented Jul 27, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lmiccini, stuggi

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/f37c6e7b13f940d6b67983bce1e31cb6

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 49m 46s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 31m 53s
cifmw-crc-podified-edpm-baremetal NODE_FAILURE Node(set) request 099-0000154427 failed in 0s

@lmiccini

Copy link
Copy Markdown
Contributor Author

recheck

@lmiccini

Copy link
Copy Markdown
Contributor Author

/test infra-operator-build-deploy-kuttl

@lmiccini

Copy link
Copy Markdown
Contributor Author

/cherry-pick 18-stable

@openshift-cherrypick-robot

Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick 18-stable

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 517307d into openstack-k8s-operators:main Jul 28, 2026
7 checks passed
@lmiccini
lmiccini deleted the instanceha-image-configmap-priority branch July 28, 2026 06:03
@openshift-cherrypick-robot

Copy link
Copy Markdown

@lmiccini: new pull request created: #641

Details

In response to this:

/cherry-pick 18-stable

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.

3 participants