diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 9df137316d..f52137ddae 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -15231,6 +15231,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml index 811640cd00..0ddc53ab79 100644 --- a/apis/bases/core.openstack.org_openstackversions.yaml +++ b/apis/bases/core.openstack.org_openstackversions.yaml @@ -191,6 +191,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -413,6 +415,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -605,6 +609,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go index d65773876d..70bf6559ea 100644 --- a/apis/core/v1beta1/openstackversion_types.go +++ b/apis/core/v1beta1/openstackversion_types.go @@ -82,39 +82,41 @@ type ContainerTemplate struct { AodhListenerImage *string `json:"aodhListenerImage,omitempty"` AodhNotifierImage *string `json:"aodhNotifierImage,omitempty"` // this is shared by BaremetalOperator, OctaviaOperator, and TelemetryOperator - ApacheImage *string `json:"apacheImage,omitempty"` - BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"` - BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"` - BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"` - CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"` - CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"` - CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"` - CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"` - CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"` - CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"` - CinderAPIImage *string `json:"cinderAPIImage,omitempty"` - CinderBackupImage *string `json:"cinderBackupImage,omitempty"` - CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"` - DesignateAPIImage *string `json:"designateAPIImage,omitempty"` - DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"` - DesignateCentralImage *string `json:"designateCentralImage,omitempty"` - DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"` - DesignateProducerImage *string `json:"designateProducerImage,omitempty"` - DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"` - DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"` - EdpmFrrImage *string `json:"edpmFrrImage,omitempty"` - EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` - EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` - EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"` - EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"` - EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"` - EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"` - EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"` - EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"` - EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"` - EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"` - EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"` + ApacheImage *string `json:"apacheImage,omitempty"` + BarbicanAPIImage *string `json:"barbicanAPIImage,omitempty"` + BarbicanKeystoneListenerImage *string `json:"barbicanKeystoneListenerImage,omitempty"` + BarbicanWorkerImage *string `json:"barbicanWorkerImage,omitempty"` + CeilometerCentralImage *string `json:"ceilometerCentralImage,omitempty"` + CeilometerComputeImage *string `json:"ceilometerComputeImage,omitempty"` + CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"` + CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"` + CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"` + CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"` + CinderAPIImage *string `json:"cinderAPIImage,omitempty"` + CinderBackupImage *string `json:"cinderBackupImage,omitempty"` + CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"` + DesignateAPIImage *string `json:"designateAPIImage,omitempty"` + DesignateBackendbind9Image *string `json:"designateBackendbind9Image,omitempty"` + DesignateCentralImage *string `json:"designateCentralImage,omitempty"` + DesignateMdnsImage *string `json:"designateMdnsImage,omitempty"` + DesignateProducerImage *string `json:"designateProducerImage,omitempty"` + DesignateUnboundImage *string `json:"designateUnboundImage,omitempty"` + DesignateWorkerImage *string `json:"designateWorkerImage,omitempty"` + EdpmFrrImage *string `json:"edpmFrrImage,omitempty"` + EdpmIscsidImage *string `json:"edpmIscsidImage,omitempty"` + EdpmLogrotateCrondImage *string `json:"edpmLogrotateCrondImage,omitempty"` + EdpmMultipathdImage *string `json:"edpmMultipathdImage,omitempty"` + EdpmNeutronDhcpAgentImage *string `json:"edpmNeutronDhcpAgentImage,omitempty"` + EdpmNeutronMetadataAgentImage *string `json:"edpmNeutronMetadataAgentImage,omitempty"` + EdpmNeutronOvnAgentImage *string `json:"edpmNeutronOvnAgentImage,omitempty"` + EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"` + EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"` + EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"` + EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"` + EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"` + // Deprecated: Use OpenstackNetworkExporterImage instead EdpmOpenstackNetworkExporterImage *string `json:"edpmOpenstackNetworkExporterImage,omitempty"` + OpenstackNetworkExporterImage *string `json:"openstackNetworkExporterImage,omitempty"` GlanceAPIImage *string `json:"glanceAPIImage,omitempty"` HeatAPIImage *string `json:"heatAPIImage,omitempty"` HeatCfnapiImage *string `json:"heatCfnapiImage,omitempty"` diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go index 9bd836b090..5c46d06a35 100644 --- a/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/apis/core/v1beta1/zz_generated.deepcopy.go @@ -446,6 +446,11 @@ func (in *ContainerTemplate) DeepCopyInto(out *ContainerTemplate) { *out = new(string) **out = **in } + if in.OpenstackNetworkExporterImage != nil { + in, out := &in.OpenstackNetworkExporterImage, &out.OpenstackNetworkExporterImage + *out = new(string) + **out = **in + } if in.GlanceAPIImage != nil { in, out := &in.GlanceAPIImage, &out.GlanceAPIImage *out = new(string) diff --git a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go index c865a51df8..2462974e32 100644 --- a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -216,27 +216,27 @@ func (instance OpenStackDataPlaneNodeSet) GetAnsibleEESpec() AnsibleEESpec { // if no values are set elsewhere. var ContainerImageDefaults = openstackv1.ContainerImages{ ContainerTemplate: openstackv1.ContainerTemplate{ - AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"), - AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"), - ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"), - EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"), - EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"), - EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"), - EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"), - EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"), - EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"), - EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"), - EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"), - NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"), - OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"), - EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"), - CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"), - 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"), - EdpmOpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"), - OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"), + AgentImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-baremetal-operator-agent:current-podified"), + AnsibleeeImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-ansibleee-runner:latest"), + ApacheImage: getStrPtr("registry.redhat.io/ubi9/httpd-24:latest"), + EdpmFrrImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-frr:current-podified"), + EdpmIscsidImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-iscsid:current-podified"), + EdpmLogrotateCrondImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-cron:current-podified"), + EdpmNeutronDhcpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-dhcp-agent:current-podified"), + EdpmNeutronMetadataAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified"), + EdpmNeutronOvnAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-ovn-agent:current-podified"), + EdpmNeutronSriovAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"), + EdpmMultipathdImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-multipathd:current-podified"), + NovaComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"), + OvnControllerImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-controller:current-podified"), + EdpmOvnBgpAgentImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"), + CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"), + 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"), + OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"), + OsContainerImage: getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"), }} // ContainerImages - the values if no OpenStackVersion is used @@ -248,27 +248,27 @@ func SetupDefaults() { // Acquire environmental defaults and initialize dataplane defaults with them ContainerImages = openstackv1.ContainerImages{ ContainerTemplate: openstackv1.ContainerTemplate{ - AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage), - AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage), - ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage), - EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage), - EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage), - EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage), - EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage), - EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage), - EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage), - EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage), - EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage), - EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage), - EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage), - EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage), - EdpmOpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_EDPM_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOpenstackNetworkExporterImage), - EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage), - CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage), - CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage), - NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage), - OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage), - OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage), + AgentImage: getImageDefault("RELATED_IMAGE_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.AgentImage), + AnsibleeeImage: getImageDefault("RELATED_IMAGE_ANSIBLEEE_IMAGE_URL_DEFAULT", ContainerImageDefaults.AnsibleeeImage), + ApacheImage: getImageDefault("RELATED_IMAGE_APACHE_IMAGE_URL_DEFAULT", ContainerImageDefaults.ApacheImage), + EdpmFrrImage: getImageDefault("RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmFrrImage), + EdpmIscsidImage: getImageDefault("RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmIscsidImage), + EdpmLogrotateCrondImage: getImageDefault("RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmLogrotateCrondImage), + EdpmMultipathdImage: getImageDefault("RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmMultipathdImage), + EdpmNeutronDhcpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_DHCP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronDhcpAgentImage), + EdpmNeutronMetadataAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronMetadataAgentImage), + EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage), + EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage), + EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage), + EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage), + EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage), + OpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OpenstackNetworkExporterImage), + EdpmOvnBgpAgentImage: getImageDefault("RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmOvnBgpAgentImage), + CeilometerComputeImage: getImageDefault("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerComputeImage), + CeilometerIpmiImage: getImageDefault("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", ContainerImageDefaults.CeilometerIpmiImage), + NovaComputeImage: getImageDefault("RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT", ContainerImageDefaults.NovaComputeImage), + OvnControllerImage: getImageDefault("RELATED_IMAGE_OVN_CONTROLLER_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.OvnControllerImage), + OsContainerImage: getImageDefault("RELATED_IMAGE_OS_CONTAINER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OsContainerImage), }, } } diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index ee34058e84..e7025571ce 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -15395,6 +15395,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -16980,6 +16982,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -17202,6 +17206,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -17394,6 +17400,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 9df137316d..f52137ddae 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -15231,6 +15231,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml index 811640cd00..0ddc53ab79 100644 --- a/config/crd/bases/core.openstack.org_openstackversions.yaml +++ b/config/crd/bases/core.openstack.org_openstackversions.yaml @@ -191,6 +191,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -413,6 +415,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: @@ -605,6 +609,8 @@ spec: type: string openstackClientImage: type: string + openstackNetworkExporterImage: + type: string osContainerImage: type: string ovnControllerImage: diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 7d88ab4925..188d509738 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -87,7 +87,7 @@ spec: value: quay.io/prometheus/node-exporter:v1.5.0 - name: RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT value: quay.io/sustainable_computing_io/kepler:release-0.7.12 - - name: RELATED_IMAGE_EDPM_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT + - name: RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT value: quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified - name: RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index a747106eaf..5a07c4890f 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -83,7 +83,7 @@ export RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-a export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified export RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0 -export RELATED_IMAGE_EDPM_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified +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_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified diff --git a/pkg/dataplane/inventory.go b/pkg/dataplane/inventory.go index eafbf568a2..e201a36e78 100644 --- a/pkg/dataplane/inventory.go +++ b/pkg/dataplane/inventory.go @@ -349,7 +349,9 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible. group.Vars["edpm_telemetry_podman_exporter_image"] = containerImages.EdpmPodmanExporterImage } if template.Ansible.AnsibleVars["edpm_telemetry_openstack_network_exporter_image"] == nil { - group.Vars["edpm_telemetry_openstack_network_exporter_image"] = containerImages.EdpmOpenstackNetworkExporterImage + if containerImages.OpenstackNetworkExporterImage != nil { + group.Vars["edpm_telemetry_openstack_network_exporter_image"] = containerImages.OpenstackNetworkExporterImage + } } err := unmarshalAnsibleVars(template.Ansible.AnsibleVars, group.Vars) diff --git a/pkg/dataplane/util/version.go b/pkg/dataplane/util/version.go index e03feb7e39..b02f72e0fe 100644 --- a/pkg/dataplane/util/version.go +++ b/pkg/dataplane/util/version.go @@ -74,7 +74,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmNodeExporterImage = version.Status.ContainerImages.EdpmNodeExporterImage containerImages.EdpmKeplerImage = version.Status.ContainerImages.EdpmKeplerImage containerImages.EdpmPodmanExporterImage = version.Status.ContainerImages.EdpmPodmanExporterImage - containerImages.EdpmOpenstackNetworkExporterImage = version.Status.ContainerImages.EdpmOpenstackNetworkExporterImage + containerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage containerImages.EdpmOvnBgpAgentImage = version.Status.ContainerImages.EdpmOvnBgpAgentImage containerImages.NovaComputeImage = version.Status.ContainerImages.NovaComputeImage containerImages.OvnControllerImage = version.Status.ContainerImages.OvnControllerImage @@ -96,7 +96,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmNodeExporterImage = dataplanev1.ContainerImages.EdpmNodeExporterImage containerImages.EdpmKeplerImage = dataplanev1.ContainerImages.EdpmKeplerImage containerImages.EdpmPodmanExporterImage = dataplanev1.ContainerImages.EdpmPodmanExporterImage - containerImages.EdpmOpenstackNetworkExporterImage = dataplanev1.ContainerImages.EdpmOpenstackNetworkExporterImage + containerImages.OpenstackNetworkExporterImage = dataplanev1.ContainerImages.OpenstackNetworkExporterImage containerImages.EdpmOvnBgpAgentImage = dataplanev1.ContainerImages.EdpmOvnBgpAgentImage containerImages.NovaComputeImage = dataplanev1.ContainerImages.NovaComputeImage containerImages.OvnControllerImage = dataplanev1.ContainerImages.OvnControllerImage diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go index 83a783969b..ee40bc4fbf 100644 --- a/pkg/openstack/version.go +++ b/pkg/openstack/version.go @@ -89,6 +89,19 @@ func getImg(val1 *string, val2 *string) *string { } +// getOpenstackNetworkExporterImg handles backward compatibility for OpenStack Network Exporter image +func getOpenstackNetworkExporterImg(customImages corev1beta1.CustomContainerImages, defaults *corev1beta1.ContainerDefaults) *string { + if customImages.OpenstackNetworkExporterImage != nil { + return customImages.OpenstackNetworkExporterImage + } + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility + if customImages.EdpmOpenstackNetworkExporterImage != nil { + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility + return customImages.EdpmOpenstackNetworkExporterImage + } + return defaults.OpenstackNetworkExporterImage +} + // GetContainerImages - initializes OpenStackVersion CR with default container images func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1beta1.OpenStackVersion) corev1beta1.ContainerImages { @@ -98,94 +111,94 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 CeilometerProxyImage: getImg(instance.Spec.CustomContainerImages.ApacheImage, defaults.ApacheImage), OctaviaApacheImage: getImg(instance.Spec.CustomContainerImages.ApacheImage, defaults.ApacheImage), ContainerTemplate: corev1beta1.ContainerTemplate{ - AgentImage: getImg(instance.Spec.CustomContainerImages.AgentImage, defaults.AgentImage), - AnsibleeeImage: getImg(instance.Spec.CustomContainerImages.AnsibleeeImage, defaults.AnsibleeeImage), - AodhAPIImage: getImg(instance.Spec.CustomContainerImages.AodhAPIImage, defaults.AodhAPIImage), - AodhEvaluatorImage: getImg(instance.Spec.CustomContainerImages.AodhEvaluatorImage, defaults.AodhEvaluatorImage), - AodhListenerImage: getImg(instance.Spec.CustomContainerImages.AodhListenerImage, defaults.AodhListenerImage), - AodhNotifierImage: getImg(instance.Spec.CustomContainerImages.AodhNotifierImage, defaults.AodhNotifierImage), - ApacheImage: getImg(instance.Spec.CustomContainerImages.ApacheImage, defaults.ApacheImage), - BarbicanAPIImage: getImg(instance.Spec.CustomContainerImages.BarbicanAPIImage, defaults.BarbicanAPIImage), - BarbicanKeystoneListenerImage: getImg(instance.Spec.CustomContainerImages.BarbicanKeystoneListenerImage, defaults.BarbicanKeystoneListenerImage), - BarbicanWorkerImage: getImg(instance.Spec.CustomContainerImages.BarbicanWorkerImage, defaults.BarbicanWorkerImage), - CeilometerCentralImage: getImg(instance.Spec.CustomContainerImages.CeilometerCentralImage, defaults.CeilometerCentralImage), - CeilometerComputeImage: getImg(instance.Spec.CustomContainerImages.CeilometerComputeImage, defaults.CeilometerComputeImage), - CeilometerIpmiImage: getImg(instance.Spec.CustomContainerImages.CeilometerIpmiImage, defaults.CeilometerIpmiImage), - CeilometerNotificationImage: getImg(instance.Spec.CustomContainerImages.CeilometerNotificationImage, defaults.CeilometerNotificationImage), - CeilometerSgcoreImage: getImg(instance.Spec.CustomContainerImages.CeilometerSgcoreImage, defaults.CeilometerSgcoreImage), - CeilometerMysqldExporterImage: getImg(instance.Spec.CustomContainerImages.CeilometerMysqldExporterImage, defaults.CeilometerMysqldExporterImage), - CinderAPIImage: getImg(instance.Spec.CustomContainerImages.CinderAPIImage, defaults.CinderAPIImage), - CinderBackupImage: getImg(instance.Spec.CustomContainerImages.CinderBackupImage, defaults.CinderBackupImage), - CinderSchedulerImage: getImg(instance.Spec.CustomContainerImages.CinderSchedulerImage, defaults.CinderSchedulerImage), - DesignateAPIImage: getImg(instance.Spec.CustomContainerImages.DesignateAPIImage, defaults.DesignateAPIImage), - DesignateBackendbind9Image: getImg(instance.Spec.CustomContainerImages.DesignateBackendbind9Image, defaults.DesignateBackendbind9Image), - DesignateCentralImage: getImg(instance.Spec.CustomContainerImages.DesignateCentralImage, defaults.DesignateCentralImage), - DesignateMdnsImage: getImg(instance.Spec.CustomContainerImages.DesignateMdnsImage, defaults.DesignateMdnsImage), - DesignateProducerImage: getImg(instance.Spec.CustomContainerImages.DesignateProducerImage, defaults.DesignateProducerImage), - DesignateUnboundImage: getImg(instance.Spec.CustomContainerImages.DesignateUnboundImage, defaults.DesignateUnboundImage), - DesignateWorkerImage: getImg(instance.Spec.CustomContainerImages.DesignateWorkerImage, defaults.DesignateWorkerImage), - EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), - EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), - EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), - EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), - EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage), - EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage), - EdpmNeutronOvnAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronOvnAgentImage, defaults.EdpmNeutronOvnAgentImage), - EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage), - EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage), - EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage), - EdpmKeplerImage: getImg(instance.Spec.CustomContainerImages.EdpmKeplerImage, defaults.EdpmKeplerImage), - EdpmPodmanExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmPodmanExporterImage, defaults.EdpmPodmanExporterImage), - EdpmOpenstackNetworkExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmOpenstackNetworkExporterImage, defaults.EdpmOpenstackNetworkExporterImage), - GlanceAPIImage: getImg(instance.Spec.CustomContainerImages.GlanceAPIImage, defaults.GlanceAPIImage), - HeatAPIImage: getImg(instance.Spec.CustomContainerImages.HeatAPIImage, defaults.HeatAPIImage), - HeatCfnapiImage: getImg(instance.Spec.CustomContainerImages.HeatCfnapiImage, defaults.HeatCfnapiImage), - HeatEngineImage: getImg(instance.Spec.CustomContainerImages.HeatEngineImage, defaults.HeatEngineImage), - HorizonImage: getImg(instance.Spec.CustomContainerImages.HorizonImage, defaults.HorizonImage), - InfraDnsmasqImage: getImg(instance.Spec.CustomContainerImages.InfraDnsmasqImage, defaults.InfraDnsmasqImage), - InfraMemcachedImage: getImg(instance.Spec.CustomContainerImages.InfraMemcachedImage, defaults.InfraMemcachedImage), - InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage), - IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage), - IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage), - IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage), - IronicNeutronAgentImage: getImg(instance.Spec.CustomContainerImages.IronicNeutronAgentImage, defaults.IronicNeutronAgentImage), - IronicPxeImage: getImg(instance.Spec.CustomContainerImages.IronicPxeImage, defaults.IronicPxeImage), - IronicPythonAgentImage: getImg(instance.Spec.CustomContainerImages.IronicPythonAgentImage, defaults.IronicPythonAgentImage), - KeystoneAPIImage: getImg(instance.Spec.CustomContainerImages.KeystoneAPIImage, defaults.KeystoneAPIImage), - KsmImage: getImg(instance.Spec.CustomContainerImages.KsmImage, defaults.KsmImage), - ManilaAPIImage: getImg(instance.Spec.CustomContainerImages.ManilaAPIImage, defaults.ManilaAPIImage), - ManilaSchedulerImage: getImg(instance.Spec.CustomContainerImages.ManilaSchedulerImage, defaults.ManilaSchedulerImage), - MariadbImage: getImg(instance.Spec.CustomContainerImages.MariadbImage, defaults.MariadbImage), - NetUtilsImage: getImg(instance.Spec.CustomContainerImages.NetUtilsImage, defaults.NetUtilsImage), - NeutronAPIImage: getImg(instance.Spec.CustomContainerImages.NeutronAPIImage, defaults.NeutronAPIImage), - NovaAPIImage: getImg(instance.Spec.CustomContainerImages.NovaAPIImage, defaults.NovaAPIImage), - NovaComputeImage: getImg(instance.Spec.CustomContainerImages.NovaComputeImage, defaults.NovaComputeImage), - NovaConductorImage: getImg(instance.Spec.CustomContainerImages.NovaConductorImage, defaults.NovaConductorImage), - NovaNovncImage: getImg(instance.Spec.CustomContainerImages.NovaNovncImage, defaults.NovaNovncImage), - NovaSchedulerImage: getImg(instance.Spec.CustomContainerImages.NovaSchedulerImage, defaults.NovaSchedulerImage), - OctaviaAPIImage: getImg(instance.Spec.CustomContainerImages.OctaviaAPIImage, defaults.OctaviaAPIImage), - OctaviaHealthmanagerImage: getImg(instance.Spec.CustomContainerImages.OctaviaHealthmanagerImage, defaults.OctaviaHealthmanagerImage), - OctaviaHousekeepingImage: getImg(instance.Spec.CustomContainerImages.OctaviaHousekeepingImage, defaults.OctaviaHousekeepingImage), - OctaviaWorkerImage: getImg(instance.Spec.CustomContainerImages.OctaviaWorkerImage, defaults.OctaviaWorkerImage), - OctaviaRsyslogImage: getImg(instance.Spec.CustomContainerImages.OctaviaRsyslogImage, defaults.OctaviaRsyslogImage), - OpenstackClientImage: getImg(instance.Spec.CustomContainerImages.OpenstackClientImage, defaults.OpenstackClientImage), - OsContainerImage: getImg(instance.Spec.CustomContainerImages.OsContainerImage, defaults.OsContainerImage), - OvnControllerImage: getImg(instance.Spec.CustomContainerImages.OvnControllerImage, defaults.OvnControllerImage), - OvnControllerOvsImage: getImg(instance.Spec.CustomContainerImages.OvnControllerOvsImage, defaults.OvnControllerOvsImage), - OvnNbDbclusterImage: getImg(instance.Spec.CustomContainerImages.OvnNbDbclusterImage, defaults.OvnNbDbclusterImage), - OvnNorthdImage: getImg(instance.Spec.CustomContainerImages.OvnNorthdImage, defaults.OvnNorthdImage), - OvnSbDbclusterImage: getImg(instance.Spec.CustomContainerImages.OvnSbDbclusterImage, defaults.OvnSbDbclusterImage), - PlacementAPIImage: getImg(instance.Spec.CustomContainerImages.PlacementAPIImage, defaults.PlacementAPIImage), - RabbitmqImage: getImg(instance.Spec.CustomContainerImages.RabbitmqImage, defaults.RabbitmqImage), - SwiftAccountImage: getImg(instance.Spec.CustomContainerImages.SwiftAccountImage, defaults.SwiftAccountImage), - SwiftContainerImage: getImg(instance.Spec.CustomContainerImages.SwiftContainerImage, defaults.SwiftContainerImage), - SwiftObjectImage: getImg(instance.Spec.CustomContainerImages.SwiftObjectImage, defaults.SwiftObjectImage), - SwiftProxyImage: getImg(instance.Spec.CustomContainerImages.SwiftProxyImage, defaults.SwiftProxyImage), - TelemetryNodeExporterImage: getImg(instance.Spec.CustomContainerImages.TelemetryNodeExporterImage, defaults.TelemetryNodeExporterImage), - TestTempestImage: getImg(instance.Spec.CustomContainerImages.TestTempestImage, defaults.TestTempestImage), - TestTobikoImage: getImg(instance.Spec.CustomContainerImages.TestTobikoImage, defaults.TestTobikoImage), - TestHorizontestImage: getImg(instance.Spec.CustomContainerImages.TestHorizontestImage, defaults.TestHorizontestImage), - TestAnsibletestImage: getImg(instance.Spec.CustomContainerImages.TestAnsibletestImage, defaults.TestAnsibletestImage), + AgentImage: getImg(instance.Spec.CustomContainerImages.AgentImage, defaults.AgentImage), + AnsibleeeImage: getImg(instance.Spec.CustomContainerImages.AnsibleeeImage, defaults.AnsibleeeImage), + AodhAPIImage: getImg(instance.Spec.CustomContainerImages.AodhAPIImage, defaults.AodhAPIImage), + AodhEvaluatorImage: getImg(instance.Spec.CustomContainerImages.AodhEvaluatorImage, defaults.AodhEvaluatorImage), + AodhListenerImage: getImg(instance.Spec.CustomContainerImages.AodhListenerImage, defaults.AodhListenerImage), + AodhNotifierImage: getImg(instance.Spec.CustomContainerImages.AodhNotifierImage, defaults.AodhNotifierImage), + ApacheImage: getImg(instance.Spec.CustomContainerImages.ApacheImage, defaults.ApacheImage), + BarbicanAPIImage: getImg(instance.Spec.CustomContainerImages.BarbicanAPIImage, defaults.BarbicanAPIImage), + BarbicanKeystoneListenerImage: getImg(instance.Spec.CustomContainerImages.BarbicanKeystoneListenerImage, defaults.BarbicanKeystoneListenerImage), + BarbicanWorkerImage: getImg(instance.Spec.CustomContainerImages.BarbicanWorkerImage, defaults.BarbicanWorkerImage), + CeilometerCentralImage: getImg(instance.Spec.CustomContainerImages.CeilometerCentralImage, defaults.CeilometerCentralImage), + CeilometerComputeImage: getImg(instance.Spec.CustomContainerImages.CeilometerComputeImage, defaults.CeilometerComputeImage), + CeilometerIpmiImage: getImg(instance.Spec.CustomContainerImages.CeilometerIpmiImage, defaults.CeilometerIpmiImage), + CeilometerNotificationImage: getImg(instance.Spec.CustomContainerImages.CeilometerNotificationImage, defaults.CeilometerNotificationImage), + CeilometerSgcoreImage: getImg(instance.Spec.CustomContainerImages.CeilometerSgcoreImage, defaults.CeilometerSgcoreImage), + CeilometerMysqldExporterImage: getImg(instance.Spec.CustomContainerImages.CeilometerMysqldExporterImage, defaults.CeilometerMysqldExporterImage), + CinderAPIImage: getImg(instance.Spec.CustomContainerImages.CinderAPIImage, defaults.CinderAPIImage), + CinderBackupImage: getImg(instance.Spec.CustomContainerImages.CinderBackupImage, defaults.CinderBackupImage), + CinderSchedulerImage: getImg(instance.Spec.CustomContainerImages.CinderSchedulerImage, defaults.CinderSchedulerImage), + DesignateAPIImage: getImg(instance.Spec.CustomContainerImages.DesignateAPIImage, defaults.DesignateAPIImage), + DesignateBackendbind9Image: getImg(instance.Spec.CustomContainerImages.DesignateBackendbind9Image, defaults.DesignateBackendbind9Image), + DesignateCentralImage: getImg(instance.Spec.CustomContainerImages.DesignateCentralImage, defaults.DesignateCentralImage), + DesignateMdnsImage: getImg(instance.Spec.CustomContainerImages.DesignateMdnsImage, defaults.DesignateMdnsImage), + DesignateProducerImage: getImg(instance.Spec.CustomContainerImages.DesignateProducerImage, defaults.DesignateProducerImage), + DesignateUnboundImage: getImg(instance.Spec.CustomContainerImages.DesignateUnboundImage, defaults.DesignateUnboundImage), + DesignateWorkerImage: getImg(instance.Spec.CustomContainerImages.DesignateWorkerImage, defaults.DesignateWorkerImage), + EdpmFrrImage: getImg(instance.Spec.CustomContainerImages.EdpmFrrImage, defaults.EdpmFrrImage), + EdpmIscsidImage: getImg(instance.Spec.CustomContainerImages.EdpmIscsidImage, defaults.EdpmIscsidImage), + EdpmLogrotateCrondImage: getImg(instance.Spec.CustomContainerImages.EdpmLogrotateCrondImage, defaults.EdpmLogrotateCrondImage), + EdpmMultipathdImage: getImg(instance.Spec.CustomContainerImages.EdpmMultipathdImage, defaults.EdpmMultipathdImage), + EdpmNeutronDhcpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronDhcpAgentImage, defaults.EdpmNeutronDhcpAgentImage), + EdpmNeutronMetadataAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronMetadataAgentImage, defaults.EdpmNeutronMetadataAgentImage), + EdpmNeutronOvnAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronOvnAgentImage, defaults.EdpmNeutronOvnAgentImage), + EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage), + EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage), + EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage), + EdpmKeplerImage: getImg(instance.Spec.CustomContainerImages.EdpmKeplerImage, defaults.EdpmKeplerImage), + EdpmPodmanExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmPodmanExporterImage, defaults.EdpmPodmanExporterImage), + OpenstackNetworkExporterImage: getOpenstackNetworkExporterImg(instance.Spec.CustomContainerImages, defaults), + GlanceAPIImage: getImg(instance.Spec.CustomContainerImages.GlanceAPIImage, defaults.GlanceAPIImage), + HeatAPIImage: getImg(instance.Spec.CustomContainerImages.HeatAPIImage, defaults.HeatAPIImage), + HeatCfnapiImage: getImg(instance.Spec.CustomContainerImages.HeatCfnapiImage, defaults.HeatCfnapiImage), + HeatEngineImage: getImg(instance.Spec.CustomContainerImages.HeatEngineImage, defaults.HeatEngineImage), + HorizonImage: getImg(instance.Spec.CustomContainerImages.HorizonImage, defaults.HorizonImage), + InfraDnsmasqImage: getImg(instance.Spec.CustomContainerImages.InfraDnsmasqImage, defaults.InfraDnsmasqImage), + InfraMemcachedImage: getImg(instance.Spec.CustomContainerImages.InfraMemcachedImage, defaults.InfraMemcachedImage), + InfraRedisImage: getImg(instance.Spec.CustomContainerImages.InfraRedisImage, defaults.InfraRedisImage), + IronicAPIImage: getImg(instance.Spec.CustomContainerImages.IronicAPIImage, defaults.IronicAPIImage), + IronicConductorImage: getImg(instance.Spec.CustomContainerImages.IronicConductorImage, defaults.IronicConductorImage), + IronicInspectorImage: getImg(instance.Spec.CustomContainerImages.IronicInspectorImage, defaults.IronicInspectorImage), + IronicNeutronAgentImage: getImg(instance.Spec.CustomContainerImages.IronicNeutronAgentImage, defaults.IronicNeutronAgentImage), + IronicPxeImage: getImg(instance.Spec.CustomContainerImages.IronicPxeImage, defaults.IronicPxeImage), + IronicPythonAgentImage: getImg(instance.Spec.CustomContainerImages.IronicPythonAgentImage, defaults.IronicPythonAgentImage), + KeystoneAPIImage: getImg(instance.Spec.CustomContainerImages.KeystoneAPIImage, defaults.KeystoneAPIImage), + KsmImage: getImg(instance.Spec.CustomContainerImages.KsmImage, defaults.KsmImage), + ManilaAPIImage: getImg(instance.Spec.CustomContainerImages.ManilaAPIImage, defaults.ManilaAPIImage), + ManilaSchedulerImage: getImg(instance.Spec.CustomContainerImages.ManilaSchedulerImage, defaults.ManilaSchedulerImage), + MariadbImage: getImg(instance.Spec.CustomContainerImages.MariadbImage, defaults.MariadbImage), + NetUtilsImage: getImg(instance.Spec.CustomContainerImages.NetUtilsImage, defaults.NetUtilsImage), + NeutronAPIImage: getImg(instance.Spec.CustomContainerImages.NeutronAPIImage, defaults.NeutronAPIImage), + NovaAPIImage: getImg(instance.Spec.CustomContainerImages.NovaAPIImage, defaults.NovaAPIImage), + NovaComputeImage: getImg(instance.Spec.CustomContainerImages.NovaComputeImage, defaults.NovaComputeImage), + NovaConductorImage: getImg(instance.Spec.CustomContainerImages.NovaConductorImage, defaults.NovaConductorImage), + NovaNovncImage: getImg(instance.Spec.CustomContainerImages.NovaNovncImage, defaults.NovaNovncImage), + NovaSchedulerImage: getImg(instance.Spec.CustomContainerImages.NovaSchedulerImage, defaults.NovaSchedulerImage), + OctaviaAPIImage: getImg(instance.Spec.CustomContainerImages.OctaviaAPIImage, defaults.OctaviaAPIImage), + OctaviaHealthmanagerImage: getImg(instance.Spec.CustomContainerImages.OctaviaHealthmanagerImage, defaults.OctaviaHealthmanagerImage), + OctaviaHousekeepingImage: getImg(instance.Spec.CustomContainerImages.OctaviaHousekeepingImage, defaults.OctaviaHousekeepingImage), + OctaviaWorkerImage: getImg(instance.Spec.CustomContainerImages.OctaviaWorkerImage, defaults.OctaviaWorkerImage), + OctaviaRsyslogImage: getImg(instance.Spec.CustomContainerImages.OctaviaRsyslogImage, defaults.OctaviaRsyslogImage), + OpenstackClientImage: getImg(instance.Spec.CustomContainerImages.OpenstackClientImage, defaults.OpenstackClientImage), + OsContainerImage: getImg(instance.Spec.CustomContainerImages.OsContainerImage, defaults.OsContainerImage), + OvnControllerImage: getImg(instance.Spec.CustomContainerImages.OvnControllerImage, defaults.OvnControllerImage), + OvnControllerOvsImage: getImg(instance.Spec.CustomContainerImages.OvnControllerOvsImage, defaults.OvnControllerOvsImage), + OvnNbDbclusterImage: getImg(instance.Spec.CustomContainerImages.OvnNbDbclusterImage, defaults.OvnNbDbclusterImage), + OvnNorthdImage: getImg(instance.Spec.CustomContainerImages.OvnNorthdImage, defaults.OvnNorthdImage), + OvnSbDbclusterImage: getImg(instance.Spec.CustomContainerImages.OvnSbDbclusterImage, defaults.OvnSbDbclusterImage), + PlacementAPIImage: getImg(instance.Spec.CustomContainerImages.PlacementAPIImage, defaults.PlacementAPIImage), + RabbitmqImage: getImg(instance.Spec.CustomContainerImages.RabbitmqImage, defaults.RabbitmqImage), + SwiftAccountImage: getImg(instance.Spec.CustomContainerImages.SwiftAccountImage, defaults.SwiftAccountImage), + SwiftContainerImage: getImg(instance.Spec.CustomContainerImages.SwiftContainerImage, defaults.SwiftContainerImage), + SwiftObjectImage: getImg(instance.Spec.CustomContainerImages.SwiftObjectImage, defaults.SwiftObjectImage), + SwiftProxyImage: getImg(instance.Spec.CustomContainerImages.SwiftProxyImage, defaults.SwiftProxyImage), + TelemetryNodeExporterImage: getImg(instance.Spec.CustomContainerImages.TelemetryNodeExporterImage, defaults.TelemetryNodeExporterImage), + TestTempestImage: getImg(instance.Spec.CustomContainerImages.TestTempestImage, defaults.TestTempestImage), + TestTobikoImage: getImg(instance.Spec.CustomContainerImages.TestTobikoImage, defaults.TestTobikoImage), + TestHorizontestImage: getImg(instance.Spec.CustomContainerImages.TestHorizontestImage, defaults.TestHorizontestImage), + TestAnsibletestImage: getImg(instance.Spec.CustomContainerImages.TestAnsibletestImage, defaults.TestAnsibletestImage), }} if containerImages.CinderVolumeImages == nil { containerImages.CinderVolumeImages = make(map[string]*string) diff --git a/tests/functional/ctlplane/openstackversion_controller_test.go b/tests/functional/ctlplane/openstackversion_controller_test.go index ea952c3bea..c50f55cb77 100644 --- a/tests/functional/ctlplane/openstackversion_controller_test.go +++ b/tests/functional/ctlplane/openstackversion_controller_test.go @@ -137,7 +137,7 @@ var _ = Describe("OpenStackOperator controller", func() { g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmKeplerImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmPodmanExporterImage).ShouldNot(BeNil()) - g.Expect(version.Status.ContainerImages.EdpmOpenstackNetworkExporterImage).ShouldNot(BeNil()) + g.Expect(version.Status.ContainerImages.OpenstackNetworkExporterImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.GlanceAPIImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.HeatAPIImage).ShouldNot(BeNil())