Skip to content

Commit 3e29170

Browse files
committed
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
1 parent 9603e06 commit 3e29170

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

api/dataplane/v1beta1/openstackdataplanenodeset_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
242242
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
243243
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
244244
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
245-
EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"),
245+
EdpmPodmanExporterImage: getStrPtr("quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest"),
246246
OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
247247
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
248248
SwiftAccountImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-swift-account:current-podified"),

config/operator/default_images.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ spec:
4040
- name: RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT
4141
value: quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified
4242
- name: RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT
43-
value: quay.io/prometheus/mysqld-exporter:v0.15.1
43+
value: quay.io/openstack-k8s-operators/mysqld_exporter:latest
4444
- name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT
4545
value: quay.io/openstack-k8s-operators/sg-core:latest
4646
- name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT
@@ -96,7 +96,7 @@ spec:
9696
- name: RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT
9797
value: quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
9898
- name: RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT
99-
value: quay.io/navidys/prometheus-podman-exporter:v1.10.1
99+
value: quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest
100100
- name: RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT
101101
value: quay.io/podified-antelope-centos9/openstack-glance-api:current-podified
102102
- name: RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT

hack/export_related_images.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antel
3434
export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified
3535
export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
3636
export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:latest
37-
export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/mysqld-exporter:v0.15.1
37+
export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/mysqld_exporter:latest
3838
export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.15.0
3939
export RELATED_IMAGE_CLOUDKITTY_API_IMAGE_URL_DEFAULT=quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current
4040
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
8787
export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0
8888
export RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified
8989
export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12
90-
export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/navidys/prometheus-podman-exporter:v1.10.1
90+
export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest
9191
export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
9292
export RELATED_IMAGE_WATCHER_API_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-api:current-podified
9393
export RELATED_IMAGE_WATCHER_APPLIER_IMAGE_URL_DEFAULT=quay.io/podified-master-centos9/openstack-watcher-applier:current-podified

0 commit comments

Comments
 (0)