From 3e29170b080f8e855d60680b37274b1b9b3881d0 Mon Sep 17 00:00:00 2001 From: Jaromir Wysoglad Date: Wed, 20 May 2026 05:08:19 -0400 Subject: [PATCH] Use prometheus-podman-exporter and mysqld_exporter images from oko quay Now that we have a workflow setup to automatically build prometheus-podman-exporter and mysqld_exporter latest images whenever there is new content in openstack-k8s-operators/prometheus-podman-exporter and openstack-k8s-operators/mysqld_exporter main branches. We can consume those images by default instead of relating on upstream images, which may have slightly different content. Closes: https://redhat.atlassian.net/browse/OSPRH-29306 --- api/dataplane/v1beta1/openstackdataplanenodeset_types.go | 2 +- config/operator/default_images.yaml | 4 ++-- hack/export_related_images.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go index 1490e2a50e..9bfea06b60 100644 --- a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -242,7 +242,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{ CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"), EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"), EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"), - EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"), + EdpmPodmanExporterImage: getStrPtr("quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest"), OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"), OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"), SwiftAccountImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-account:current-podified"), diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 430bc00ce3..235cd98c62 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -40,7 +40,7 @@ spec: - name: RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified - name: RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT - value: quay.io/prometheus/mysqld-exporter:v0.15.1 + value: quay.io/openstack-k8s-operators/mysqld_exporter:latest - name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT value: quay.io/openstack-k8s-operators/sg-core:latest - name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT @@ -96,7 +96,7 @@ spec: - name: RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified - name: RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT - value: quay.io/navidys/prometheus-podman-exporter:v1.10.1 + value: quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest - name: RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-glance-api:current-podified - name: RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index 52bbf16b79..918cea8c02 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -34,7 +34,7 @@ export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antel export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:latest -export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/mysqld-exporter:v0.15.1 +export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/mysqld_exporter:latest export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0 export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current export RELATED_IMAGE_CLOUDKITTY_PROCESSOR_IMAGE_URL_DEFAULT=quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current @@ -87,7 +87,7 @@ export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antel export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0 export RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12 -export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/navidys/prometheus-podman-exporter:v1.10.1 +export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified export RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified export RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified