diff --git a/api/core/v1beta1/openstackversion_types.go b/api/core/v1beta1/openstackversion_types.go index fea75a03f2..789521454e 100644 --- a/api/core/v1beta1/openstackversion_types.go +++ b/api/core/v1beta1/openstackversion_types.go @@ -117,6 +117,7 @@ type ContainerTemplate struct { EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"` EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"` EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"` + // Deprecated: EdpmKeplerImage is no longer used. Kepler has been removed from the telemetry stack. EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"` EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"` // Deprecated: Use OpenstackNetworkExporterImage instead diff --git a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go index 8772ad8c1a..34e113a3aa 100644 --- a/api/dataplane/v1beta1/openstackdataplanenodeset_types.go +++ b/api/dataplane/v1beta1/openstackdataplanenodeset_types.go @@ -243,6 +243,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{ 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"), + // Deprecated: EdpmKeplerImage is no longer used. Kepler has been removed from the telemetry stack. EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"), EdpmPodmanExporterImage: getStrPtr("quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest"), OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"), @@ -276,6 +277,7 @@ func SetupDefaults() { 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), + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility 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), diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml index 1a0a886dfb..f39dfb434c 100644 --- a/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml +++ b/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml @@ -15,5 +15,4 @@ spec: caCerts: combined-ca-bundle containerImageFields: - CeilometerIpmiImage - - EdpmKeplerImage edpmServiceType: telemetry-power-monitoring diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc index 38d5d78993..f55cac7c15 100644 --- a/docs/assemblies/common_configurations.adoc +++ b/docs/assemblies/common_configurations.adoc @@ -88,7 +88,6 @@ ifeval::["{build}" != "downstream"] edpm_ovn_bgp_agent_local_ovn_northd_image: "quay.io/podified-antelope-centos9/openstack-ovn-northd edpm_ovn_bgp_agent_local_ovn_controller_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller edpm_telemetry_node_exporter_image: quay.io/prometheus/node-exporter - edpm_telemetry_kepler_image: "quay.io/sustainable_computing_io/kepler" edpm_telemetry_ceilometer_compute_image: quay.io/podified-antelope-centos9/openstack-ceilometer-compute edpm_telemetry_ceilometer_ipmi_image: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute @@ -111,7 +110,6 @@ ifeval::["{build}" == "downstream"] edpm_ovn_bgp_agent_local_ovn_northd_image: "redhat.registry.io/rhoso-beta/openstack-ovn-northd-rhel9:18.0.0 edpm_ovn_bgp_agent_local_ovn_controller_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0 edpm_telemetry_node_exporter_image: redhat.registry.io/prometheus/node-exporter-rhel9:18.0.0 - edpm_telemetry_kepler_image: "registry.redhat.io/openshift-power-monitoring/kepler-rhel9:v0.7.10-2" edpm_telemetry_ceilometer_compute_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-compute-rhel9:18.0.0 edpm_telemetry_ceilometer_ipmi_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-ipmi-rhel9:18.0.0 edpm_nova_compute_image: "redhat.registry.io/rhoso-beta/openstack-nova-compute-rhel9:18.0.0 diff --git a/docs/assemblies/ctlplane_resources.adoc b/docs/assemblies/ctlplane_resources.adoc index 5979fcd349..e5073630b1 100644 --- a/docs/assemblies/ctlplane_resources.adoc +++ b/docs/assemblies/ctlplane_resources.adoc @@ -2068,11 +2068,6 @@ ContainerTemplate - struct that contains container image URLs for each service i | *string | false -| edpmKeplerImage -| -| *string -| false - | edpmPodmanExporterImage | | *string diff --git a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc index 4fb0db01a7..66ec156465 100644 --- a/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc +++ b/docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc @@ -286,7 +286,6 @@ ifeval::["{build}" != "downstream"] edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified" edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified" telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0" - edpm_telemetry_kepler_image: "quay.io/sustainable_computing_io/kepler" edpm_libvirt_image: "quay.io/podified-antelope-centos9/openstack-nova-libvirt:current-podified" edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified" edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified" @@ -298,7 +297,6 @@ ifeval::["{build}" == "downstream"] edpm_frr_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0" edpm_ovn_bgp_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-ovn-bgp-agent:18.0" telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0" - edpm_telemetry_kepler_image: "registry.redhat.io/openshift-power-monitoring/kepler-rhel9:v0.7.10-2" edpm_libvirt_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-libvirt:18.0" edpm_nova_compute_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-compute:18.0" edpm_neutron_sriov_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-sriov-agent:18.0" diff --git a/internal/dataplane/inventory.go b/internal/dataplane/inventory.go index 7c8fb42480..e121303d2d 100644 --- a/internal/dataplane/inventory.go +++ b/internal/dataplane/inventory.go @@ -371,9 +371,6 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible. if template.Ansible.AnsibleVars["edpm_telemetry_node_exporter_image"] == nil { group.Vars["edpm_telemetry_node_exporter_image"] = containerImages.EdpmNodeExporterImage } - if template.Ansible.AnsibleVars["edpm_telemetry_kepler_image"] == nil { - group.Vars["edpm_telemetry_kepler_image"] = containerImages.EdpmKeplerImage - } if template.Ansible.AnsibleVars["edpm_telemetry_podman_exporter_image"] == nil { group.Vars["edpm_telemetry_podman_exporter_image"] = containerImages.EdpmPodmanExporterImage } diff --git a/internal/dataplane/util/version.go b/internal/dataplane/util/version.go index af7b2bcb86..7f074eb141 100644 --- a/internal/dataplane/util/version.go +++ b/internal/dataplane/util/version.go @@ -74,6 +74,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmNeutronOvnAgentImage = version.Status.ContainerImages.EdpmNeutronOvnAgentImage containerImages.EdpmNeutronSriovAgentImage = version.Status.ContainerImages.EdpmNeutronSriovAgentImage containerImages.EdpmNodeExporterImage = version.Status.ContainerImages.EdpmNodeExporterImage + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmKeplerImage = version.Status.ContainerImages.EdpmKeplerImage containerImages.EdpmPodmanExporterImage = version.Status.ContainerImages.EdpmPodmanExporterImage containerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage @@ -102,6 +103,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta containerImages.EdpmNeutronOvnAgentImage = dataplanev1.ContainerImages.EdpmNeutronOvnAgentImage containerImages.EdpmNeutronSriovAgentImage = dataplanev1.ContainerImages.EdpmNeutronSriovAgentImage containerImages.EdpmNodeExporterImage = dataplanev1.ContainerImages.EdpmNodeExporterImage + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility containerImages.EdpmKeplerImage = dataplanev1.ContainerImages.EdpmKeplerImage containerImages.EdpmPodmanExporterImage = dataplanev1.ContainerImages.EdpmPodmanExporterImage containerImages.OpenstackNetworkExporterImage = dataplanev1.ContainerImages.OpenstackNetworkExporterImage diff --git a/internal/openstack/version.go b/internal/openstack/version.go index 5fb3e8bb21..c9883431af 100644 --- a/internal/openstack/version.go +++ b/internal/openstack/version.go @@ -154,6 +154,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1 EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage), EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage), EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage), + //nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility EdpmKeplerImage: getImg(instance.Spec.CustomContainerImages.EdpmKeplerImage, defaults.EdpmKeplerImage), EdpmPodmanExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmPodmanExporterImage, defaults.EdpmPodmanExporterImage), OpenstackNetworkExporterImage: getOpenstackNetworkExporterImg(instance.Spec.CustomContainerImages, defaults), diff --git a/test/functional/ctlplane/openstackversion_controller_test.go b/test/functional/ctlplane/openstackversion_controller_test.go index 1438506d37..155d9eaf9e 100644 --- a/test/functional/ctlplane/openstackversion_controller_test.go +++ b/test/functional/ctlplane/openstackversion_controller_test.go @@ -136,7 +136,7 @@ var _ = Describe("OpenStackOperator controller", func() { g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil()) - g.Expect(version.Status.ContainerImages.EdpmKeplerImage).ShouldNot(BeNil()) + // EdpmKeplerImage is deprecated - Kepler has been removed from the telemetry stack g.Expect(version.Status.ContainerImages.EdpmPodmanExporterImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.OpenstackNetworkExporterImage).ShouldNot(BeNil()) g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())