Skip to content

Commit 3654536

Browse files
Merge pull request #2086 from stuggi/ubi10-httpd-24
Update RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT to ubi10/httpd-24:latest
2 parents 3015d32 + f2d1145 commit 3654536

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

‎api/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
226226
ContainerTemplate: openstackv1.ContainerTemplate{
227227
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
228228
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
229-
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
229+
ApacheImage: getStrPtr("registry.redhat.io/ubi10/httpd-24:latest"),
230230
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
231231
// Deprecated: EdpmIscsidImage is no longer used. iscsid now runs on the host instead of in a container.
232232
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),

‎config/operator/default_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- name: RELATED_IMAGE_AODH_NOTIFIER_IMAGE_URL_DEFAULT
2525
value: quay.io/podified-antelope-centos9/openstack-aodh-notifier:current-podified
2626
- name: RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT
27-
value: registry.redhat.io/ubi9/httpd-24:latest
27+
value: registry.redhat.io/ubi10/httpd-24:latest
2828
- name: RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT
2929
value: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified
3030
- name: RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT

‎docs/assemblies/con_provisioning-bare-metal-data-plane-nodes.adoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ spec:
347347
port: 6190
348348
osImage: my-custom-image.qcow2 # qcow2 file inside the container
349349
osContainerImageUrl: <your-registry>/my-custom-os-image:latest
350-
apacheImageUrl: registry.redhat.io/ubi9/httpd-24:latest
350+
apacheImageUrl: registry.redhat.io/ubi10/httpd-24:latest
351351
agentImageUrl: quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:latest
352352
----
353353

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export RELATED_IMAGE_IRONIC_NEUTRON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-ant
2626
export RELATED_IMAGE_IRONIC_PYTHON_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/ironic-python-agent:current-podified
2727
export RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified
2828
export RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified
29-
export RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT=registry.redhat.io/ubi9/httpd-24:latest
29+
export RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT=registry.redhat.io/ubi10/httpd-24:latest
3030
export OS_IMAGE_DEFAULT=edpm-hardened-uefi.qcow2
3131
export RELATED_IMAGE_PLACEMENT_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-placement-api:current-podified
3232
export RELATED_IMAGE_CEILOMETER_CENTRAL_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-central:current-podified

0 commit comments

Comments
 (0)