Skip to content

Commit 40ca98b

Browse files
paramiteparamite
committed
Add podman-exporter image default value
1 parent 818584d commit 40ca98b

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
@@ -17460,6 +17460,8 @@ spec:
1746017460
type: string
1746117461
edpmOvnBgpAgentImage:
1746217462
type: string
17463+
edpmPodmanExporterImage:
17464+
type: string
1746317465
glanceAPIImage:
1746417466
type: string
1746517467
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:
@@ -327,6 +329,8 @@ spec:
327329
type: string
328330
edpmOvnBgpAgentImage:
329331
type: string
332+
edpmPodmanExporterImage:
333+
type: string
330334
glanceAPIImage:
331335
type: string
332336
heatAPIImage:
@@ -509,6 +513,8 @@ spec:
509513
type: string
510514
edpmOvnBgpAgentImage:
511515
type: string
516+
edpmPodmanExporterImage:
517+
type: string
512518
glanceAPIImage:
513519
type: string
514520
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
@@ -17624,6 +17624,8 @@ spec:
1762417624
type: string
1762517625
edpmOvnBgpAgentImage:
1762617626
type: string
17627+
edpmPodmanExporterImage:
17628+
type: string
1762717629
glanceAPIImage:
1762817630
type: string
1762917631
heatAPIImage:
@@ -19193,6 +19195,8 @@ spec:
1919319195
type: string
1919419196
edpmOvnBgpAgentImage:
1919519197
type: string
19198+
edpmPodmanExporterImage:
19199+
type: string
1919619200
glanceAPIImage:
1919719201
type: string
1919819202
heatAPIImage:
@@ -19404,6 +19408,8 @@ spec:
1940419408
type: string
1940519409
edpmOvnBgpAgentImage:
1940619410
type: string
19411+
edpmPodmanExporterImage:
19412+
type: string
1940719413
glanceAPIImage:
1940819414
type: string
1940919415
heatAPIImage:
@@ -19586,6 +19592,8 @@ spec:
1958619592
type: string
1958719593
edpmOvnBgpAgentImage:
1958819594
type: string
19595+
edpmPodmanExporterImage:
19596+
type: string
1958919597
glanceAPIImage:
1959019598
type: string
1959119599
heatAPIImage:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17460,6 +17460,8 @@ spec:
1746017460
type: string
1746117461
edpmOvnBgpAgentImage:
1746217462
type: string
17463+
edpmPodmanExporterImage:
17464+
type: string
1746317465
glanceAPIImage:
1746417466
type: string
1746517467
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:
@@ -327,6 +329,8 @@ spec:
327329
type: string
328330
edpmOvnBgpAgentImage:
329331
type: string
332+
edpmPodmanExporterImage:
333+
type: string
330334
glanceAPIImage:
331335
type: string
332336
heatAPIImage:
@@ -509,6 +513,8 @@ spec:
509513
type: string
510514
edpmOvnBgpAgentImage:
511515
type: string
516+
edpmPodmanExporterImage:
517+
type: string
512518
glanceAPIImage:
513519
type: string
514520
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
@@ -83,6 +83,7 @@ export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified
8383
export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
8484
export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0
8585
export RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.12
86+
export RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT=quay.io/navidys/prometheus-podman-exporter:v1.10.1
8687
export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
8788
export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
8889
export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified

0 commit comments

Comments
 (0)