Skip to content

Commit e31b19f

Browse files
karelyatinkarelyatin
committed
Switch Network Exporter image to be generic
Network Exporter being extended to be used on Control plane pods, so make it generic. Resolves: #OSPRH-18529
1 parent c4bce29 commit e31b19f

14 files changed

+214
-168
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15231,6 +15231,8 @@ spec:
1523115231
type: string
1523215232
openstackClientImage:
1523315233
type: string
15234+
openstackNetworkExporterImage:
15235+
type: string
1523415236
osContainerImage:
1523515237
type: string
1523615238
ovnControllerImage:

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ spec:
191191
type: string
192192
openstackClientImage:
193193
type: string
194+
openstackNetworkExporterImage:
195+
type: string
194196
osContainerImage:
195197
type: string
196198
ovnControllerImage:
@@ -413,6 +415,8 @@ spec:
413415
type: string
414416
openstackClientImage:
415417
type: string
418+
openstackNetworkExporterImage:
419+
type: string
416420
osContainerImage:
417421
type: string
418422
ovnControllerImage:
@@ -605,6 +609,8 @@ spec:
605609
type: string
606610
openstackClientImage:
607611
type: string
612+
openstackNetworkExporterImage:
613+
type: string
608614
osContainerImage:
609615
type: string
610616
ovnControllerImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,39 +82,41 @@ type ContainerTemplate struct {
8282
AodhListenerImage *string `json:"aodhListenerImage,omitempty"`
8383
AodhNotifierImage *string `json:"aodhNotifierImage,omitempty"`
8484
// this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator
85-
ApacheImage *string `json:"apacheImage,omitempty"`
86-
BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"`
87-
BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`
88-
BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"`
89-
CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"`
90-
CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"`
91-
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`
92-
CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"`
93-
CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"`
94-
CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"`
95-
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
96-
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
97-
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
98-
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
99-
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
100-
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`
101-
DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"`
102-
DesignateProducerImage *string `json:"designateProducerImage,omitempty"`
103-
DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"`
104-
DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"`
105-
EdpmFrrImage *string `json:"edpmFrrImage,omitempty"`
106-
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
107-
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
108-
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
109-
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
110-
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`
111-
EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"`
112-
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
113-
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
114-
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
115-
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
116-
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
85+
ApacheImage *string `json:"apacheImage,omitempty"`
86+
BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"`
87+
BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"`
88+
BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"`
89+
CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"`
90+
CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"`
91+
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`
92+
CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"`
93+
CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"`
94+
CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"`
95+
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
96+
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
97+
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`
98+
DesignateAPIImage *string `json:"designateAPIImage,omitempty"`
99+
DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"`
100+
DesignateCentralImage *string `json:"designateCentralImage,omitempty"`
101+
DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"`
102+
DesignateProducerImage *string `json:"designateProducerImage,omitempty"`
103+
DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"`
104+
DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"`
105+
EdpmFrrImage *string `json:"edpmFrrImage,omitempty"`
106+
EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"`
107+
EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"`
108+
EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"`
109+
EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"`
110+
EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"`
111+
EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"`
112+
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
113+
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
114+
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
115+
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
116+
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
117+
// Deprecated: Use OpenstackNetworkExporterImage instead
117118
EdpmOpenstackNetworkExporterImage *string `json:"edpmOpenstackNetworkExporterImage,omitempty"`
119+
OpenstackNetworkExporterImage *string `json:"openstackNetworkExporterImage,omitempty"`
118120
GlanceAPIImage *string `json:"glanceAPIImage,omitempty"`
119121
HeatAPIImage *string `json:"heatAPIImage,omitempty"`
120122
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: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -216,27 +216,27 @@ func (instance OpenStackDataPlaneNodeSet) GetAnsibleEESpec() AnsibleEESpec {
216216
// if no values are set elsewhere.
217217
var ContainerImageDefaults = openstackv1.ContainerImages{
218218
ContainerTemplate: openstackv1.ContainerTemplate{
219-
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
220-
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
221-
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
222-
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
223-
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
224-
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
225-
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"),
226-
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"),
227-
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"),
228-
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"),
229-
EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"),
230-
NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"),
231-
OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"),
232-
EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"),
233-
CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"),
234-
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
235-
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
236-
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
237-
EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"),
238-
EdpmOpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
239-
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
219+
AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"),
220+
AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"),
221+
ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"),
222+
EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"),
223+
EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"),
224+
EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"),
225+
EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"),
226+
EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"),
227+
EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"),
228+
EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"),
229+
EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"),
230+
NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"),
231+
OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"),
232+
EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"),
233+
CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"),
234+
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
235+
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
236+
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
237+
EdpmPodmanExporterImage: getStrPtr("quay.io/navidys/prometheus-podman-exporter:v1.10.1"),
238+
OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
239+
OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
240240
}}
241241

242242
// ContainerImages - the values if no OpenStackVersion is used
@@ -248,27 +248,27 @@ func SetupDefaults() {
248248
// Acquire environmental defaults and initialize dataplane defaults with them
249249
ContainerImages = openstackv1.ContainerImages{
250250
ContainerTemplate: openstackv1.ContainerTemplate{
251-
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
252-
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
253-
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
254-
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
255-
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
256-
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),
257-
EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage),
258-
EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage),
259-
EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage),
260-
EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage),
261-
EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage),
262-
EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage),
263-
EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage),
264-
EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage),
265-
EdpmOpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_EDPM_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOpenstackNetworkExporterImage),
266-
EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage),
267-
CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage),
268-
CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage),
269-
NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage),
270-
OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage),
271-
OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage),
251+
AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage),
252+
AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage),
253+
ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage),
254+
EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage),
255+
EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage),
256+
EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage),
257+
EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage),
258+
EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage),
259+
EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage),
260+
EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage),
261+
EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage),
262+
EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage),
263+
EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage),
264+
EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage),
265+
OpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OpenstackNetworkExporterImage),
266+
EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage),
267+
CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage),
268+
CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage),
269+
NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage),
270+
OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage),
271+
OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage),
272272
},
273273
}
274274
}

0 commit comments

Comments
 (0)