Skip to content

Commit d62fe4a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1317 from paramite/podman-exporer-img
Add podman-exporter image default value
2 parents a73e6c1 + 40ca98b commit d62fe4a

14 files changed

Lines changed: 43 additions & 0 deletions

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17535,6 +17535,8 @@ spec:
1753517535
type: string
1753617536
edpmOvnBgpAgentImage:
1753717537
type: string
17538+
edpmPodmanExporterImage:
17539+
type: string
1753817540
glanceAPIImage:
1753917541
type: string
1754017542
heatAPIImage:

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ spec:
116116
type: string
117117
edpmOvnBgpAgentImage:
118118
type: string
119+
edpmPodmanExporterImage:
120+
type: string
119121
glanceAPIImage:
120122
type: string
121123
heatAPIImage:
@@ -329,6 +331,8 @@ spec:
329331
type: string
330332
edpmOvnBgpAgentImage:
331333
type: string
334+
edpmPodmanExporterImage:
335+
type: string
332336
glanceAPIImage:
333337
type: string
334338
heatAPIImage:
@@ -513,6 +517,8 @@ spec:
513517
type: string
514518
edpmOvnBgpAgentImage:
515519
type: string
520+
edpmPodmanExporterImage:
521+
type: string
516522
glanceAPIImage:
517523
type: string
518524
heatAPIImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ type ContainerTemplate struct {
111111
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
112112
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
113113
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
114+
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
114115
GlanceAPIImage *string `json:"glanceAPIImage,omitempty"`
115116
HeatAPIImage *string `json:"heatAPIImage,omitempty"`
116117
HeatCfnapiImage *string `json:"heatCfnapiImage,omitempty"`

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
231231
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
232232
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
233233
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
234+
EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"),
234235
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
235236
}}
236237

@@ -256,6 +257,7 @@ func SetupDefaults() {
256257
EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage),
257258
EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage),
258259
EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage),
260+
EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage),
259261
EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage),
260262
CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage),
261263
CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage),

‎bindata/crds/crds.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17699,6 +17699,8 @@ spec:
1769917699
type: string
1770017700
edpmOvnBgpAgentImage:
1770117701
type: string
17702+
edpmPodmanExporterImage:
17703+
type: string
1770217704
glanceAPIImage:
1770317705
type: string
1770417706
heatAPIImage:
@@ -19270,6 +19272,8 @@ spec:
1927019272
type: string
1927119273
edpmOvnBgpAgentImage:
1927219274
type: string
19275+
edpmPodmanExporterImage:
19276+
type: string
1927319277
glanceAPIImage:
1927419278
type: string
1927519279
heatAPIImage:
@@ -19483,6 +19487,8 @@ spec:
1948319487
type: string
1948419488
edpmOvnBgpAgentImage:
1948519489
type: string
19490+
edpmPodmanExporterImage:
19491+
type: string
1948619492
glanceAPIImage:
1948719493
type: string
1948819494
heatAPIImage:
@@ -19667,6 +19673,8 @@ spec:
1966719673
type: string
1966819674
edpmOvnBgpAgentImage:
1966919675
type: string
19676+
edpmPodmanExporterImage:
19677+
type: string
1967019678
glanceAPIImage:
1967119679
type: string
1967219680
heatAPIImage:

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17535,6 +17535,8 @@ spec:
1753517535
type: string
1753617536
edpmOvnBgpAgentImage:
1753717537
type: string
17538+
edpmPodmanExporterImage:
17539+
type: string
1753817540
glanceAPIImage:
1753917541
type: string
1754017542
heatAPIImage:

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ spec:
116116
type: string
117117
edpmOvnBgpAgentImage:
118118
type: string
119+
edpmPodmanExporterImage:
120+
type: string
119121
glanceAPIImage:
120122
type: string
121123
heatAPIImage:
@@ -329,6 +331,8 @@ spec:
329331
type: string
330332
edpmOvnBgpAgentImage:
331333
type: string
334+
edpmPodmanExporterImage:
335+
type: string
332336
glanceAPIImage:
333337
type: string
334338
heatAPIImage:
@@ -513,6 +517,8 @@ spec:
513517
type: string
514518
edpmOvnBgpAgentImage:
515519
type: string
520+
edpmPodmanExporterImage:
521+
type: string
516522
glanceAPIImage:
517523
type: string
518524
heatAPIImage:

‎config/operator/default_images.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ spec:
8989
value: quay.io/sustainable_computing_io/kepler:release-0.7.12
9090
- name: RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT
9191
value: quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
92+
- name: RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT
93+
value: quay.io/navidys/prometheus-podman-exporter:v1.10.1
9294
- name: RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT
9395
value: quay.io/podified-antelope-centos9/openstack-glance-api:current-podified
9496
- name: RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified
8484
export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
8585
export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0
8686
export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12
87+
export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/navidys/prometheus-podman-exporter:v1.10.1
8788
export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
8889
export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
8990
export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified

0 commit comments

Comments
 (0)