Skip to content

Commit 81d9ed2

Browse files
Merge pull request #2028 from jlarriba/remove-kepler
Deprecate Kepler (EdpmKeplerImage) from openstack-operator
2 parents 58a1de8 + 8c69548 commit 81d9ed2

10 files changed

Lines changed: 7 additions & 14 deletions

File tree

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ type ContainerTemplate struct {
238238
EdpmNeutronSriovAgentImage *string `json:"edpmNeutronSriovAgentImage,omitempty"`
239239
EdpmOvnBgpAgentImage *string `json:"edpmOvnBgpAgentImage,omitempty"`
240240
EdpmNodeExporterImage *string `json:"edpmNodeExporterImage,omitempty"`
241+
// Deprecated: EdpmKeplerImage is no longer used. Kepler has been removed from the telemetry stack.
241242
EdpmKeplerImage *string `json:"edpmKeplerImage,omitempty"`
242243
EdpmPodmanExporterImage *string `json:"edpmPodmanExporterImage,omitempty"`
243244
// Deprecated: Use OpenstackNetworkExporterImage instead

‎api/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
244244
CeilometerComputeImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-compute:current-podified"),
245245
CeilometerIpmiImage: getStrPtr("quay.io/podified-antelope-centos9/openstack-telemetry-ceilometer-ipmi:current-podified"),
246246
EdpmNodeExporterImage: getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
247+
// Deprecated: EdpmKeplerImage is no longer used. Kepler has been removed from the telemetry stack.
247248
EdpmKeplerImage: getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.12"),
248249
EdpmPodmanExporterImage: getStrPtr("quay.io/openstack-k8s-operators/prometheus-podman-exporter:latest"),
249250
OpenstackNetworkExporterImage: getStrPtr("quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified"),
@@ -278,6 +279,7 @@ func SetupDefaults() {
278279
EdpmNeutronOvnAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_OVN_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronOvnAgentImage),
279280
EdpmNeutronSriovAgentImage: getImageDefault("RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNeutronSriovAgentImage),
280281
EdpmNodeExporterImage: getImageDefault("RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmNodeExporterImage),
282+
//nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility
281283
EdpmKeplerImage: getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage),
282284
EdpmPodmanExporterImage: getImageDefault("RELATED_IMAGE_EDPM_PODMAN_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmPodmanExporterImage),
283285
OpenstackNetworkExporterImage: getImageDefault("RELATED_IMAGE_OPENSTACK_NETWORK_EXPORTER_IMAGE_URL_DEFAULT", ContainerImageDefaults.OpenstackNetworkExporterImage),

‎config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry_power_monitoring.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ spec:
1717
caCerts: combined-ca-bundle
1818
containerImageFields:
1919
- CeilometerIpmiImage
20-
- EdpmKeplerImage
2120
edpmServiceType: telemetry-power-monitoring

‎docs/assemblies/common_configurations.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ ifeval::["{build}" != "downstream"]
8787
edpm_ovn_bgp_agent_local_ovn_northd_image: "quay.io/podified-antelope-centos9/openstack-ovn-northd
8888
edpm_ovn_bgp_agent_local_ovn_controller_image: "quay.io/podified-antelope-centos9/openstack-ovn-controller
8989
edpm_telemetry_node_exporter_image: quay.io/prometheus/node-exporter
90-
edpm_telemetry_kepler_image: "quay.io/sustainable_computing_io/kepler"
9190
edpm_telemetry_ceilometer_compute_image: quay.io/podified-antelope-centos9/openstack-ceilometer-compute
9291
edpm_telemetry_ceilometer_ipmi_image: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi
9392
edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute
@@ -109,7 +108,6 @@ ifeval::["{build}" == "downstream"]
109108
edpm_ovn_bgp_agent_local_ovn_northd_image: "redhat.registry.io/rhoso-beta/openstack-ovn-northd-rhel9:18.0.0
110109
edpm_ovn_bgp_agent_local_ovn_controller_image: "redhat.registry.io/rhoso-beta/openstack-ovn-controller-rhel9:18.0.0
111110
edpm_telemetry_node_exporter_image: redhat.registry.io/prometheus/node-exporter-rhel9:18.0.0
112-
edpm_telemetry_kepler_image: "registry.redhat.io/openshift-power-monitoring/kepler-rhel9:v0.7.10-2"
113111
edpm_telemetry_ceilometer_compute_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-compute-rhel9:18.0.0
114112
edpm_telemetry_ceilometer_ipmi_image: redhat.registry.io/rhoso-beta/openstack-ceilometer-ipmi-rhel9:18.0.0
115113
edpm_nova_compute_image: "redhat.registry.io/rhoso-beta/openstack-nova-compute-rhel9:18.0.0

‎docs/assemblies/ctlplane_resources.adoc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,11 +2068,6 @@ ContainerTemplate - struct that contains container image URLs for each service i
20682068
| *string
20692069
| false
20702070
2071-
| edpmKeplerImage
2072-
|
2073-
| *string
2074-
| false
2075-
20762071
| edpmPodmanExporterImage
20772072
|
20782073
| *string

‎docs/assemblies/proc_creating-a-set-of-data-plane-nodes.adoc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ ifeval::["{build}" != "downstream"]
285285
edpm_frr_image: "quay.io/podified-antelope-centos9/openstack-frr:current-podified"
286286
edpm_ovn_bgp_agent_image: "quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified"
287287
telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0"
288-
edpm_telemetry_kepler_image: "quay.io/sustainable_computing_io/kepler"
289288
edpm_libvirt_image: "quay.io/podified-antelope-centos9/openstack-nova-libvirt:current-podified"
290289
edpm_nova_compute_image: "quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified"
291290
edpm_neutron_sriov_image: "quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified"
@@ -296,7 +295,6 @@ ifeval::["{build}" == "downstream"]
296295
edpm_frr_image: "registry.redhat.io/rhosp-dev-preview/openstack-frr:18.0"
297296
edpm_ovn_bgp_agent_image: "registry.redhat.io/rhosp-dev-preview/openstack-ovn-bgp-agent:18.0"
298297
telemetry_node_exporter_image: "quay.io/prometheus/node-exporter:v1.5.0"
299-
edpm_telemetry_kepler_image: "registry.redhat.io/openshift-power-monitoring/kepler-rhel9:v0.7.10-2"
300298
edpm_libvirt_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-libvirt:18.0"
301299
edpm_nova_compute_image: "registry.redhat.io/rhosp-dev-preview/openstack-nova-compute:18.0"
302300
edpm_neutron_sriov_image: "registry.redhat.io/rhosp-dev-preview/openstack-neutron-sriov-agent:18.0"

‎internal/dataplane/inventory.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,6 @@ func resolveGroupAnsibleVars(template *dataplanev1.NodeTemplate, group *ansible.
376376
if template.Ansible.AnsibleVars["edpm_telemetry_node_exporter_image"] == nil {
377377
group.Vars["edpm_telemetry_node_exporter_image"] = containerImages.EdpmNodeExporterImage
378378
}
379-
if template.Ansible.AnsibleVars["edpm_telemetry_kepler_image"] == nil {
380-
group.Vars["edpm_telemetry_kepler_image"] = containerImages.EdpmKeplerImage
381-
}
382379
if template.Ansible.AnsibleVars["edpm_telemetry_podman_exporter_image"] == nil {
383380
group.Vars["edpm_telemetry_podman_exporter_image"] = containerImages.EdpmPodmanExporterImage
384381
}

‎internal/dataplane/util/version.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
7575
containerImages.EdpmNeutronOvnAgentImage = version.Status.ContainerImages.EdpmNeutronOvnAgentImage
7676
containerImages.EdpmNeutronSriovAgentImage = version.Status.ContainerImages.EdpmNeutronSriovAgentImage
7777
containerImages.EdpmNodeExporterImage = version.Status.ContainerImages.EdpmNodeExporterImage
78+
//nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility
7879
containerImages.EdpmKeplerImage = version.Status.ContainerImages.EdpmKeplerImage
7980
containerImages.EdpmPodmanExporterImage = version.Status.ContainerImages.EdpmPodmanExporterImage
8081
containerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage
@@ -104,6 +105,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
104105
containerImages.EdpmNeutronOvnAgentImage = dataplanev1.ContainerImages.EdpmNeutronOvnAgentImage
105106
containerImages.EdpmNeutronSriovAgentImage = dataplanev1.ContainerImages.EdpmNeutronSriovAgentImage
106107
containerImages.EdpmNodeExporterImage = dataplanev1.ContainerImages.EdpmNodeExporterImage
108+
//nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility
107109
containerImages.EdpmKeplerImage = dataplanev1.ContainerImages.EdpmKeplerImage
108110
containerImages.EdpmPodmanExporterImage = dataplanev1.ContainerImages.EdpmPodmanExporterImage
109111
containerImages.OpenstackNetworkExporterImage = dataplanev1.ContainerImages.OpenstackNetworkExporterImage

‎internal/openstack/version.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ func GetContainerImages(defaults *corev1beta1.ContainerDefaults, instance corev1
155155
EdpmNeutronSriovAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmNeutronSriovAgentImage, defaults.EdpmNeutronSriovAgentImage),
156156
EdpmOvnBgpAgentImage: getImg(instance.Spec.CustomContainerImages.EdpmOvnBgpAgentImage, defaults.EdpmOvnBgpAgentImage),
157157
EdpmNodeExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmNodeExporterImage, defaults.EdpmNodeExporterImage),
158+
//nolint:staticcheck // SA1019: Intentionally using deprecated field for backward compatibility
158159
EdpmKeplerImage: getImg(instance.Spec.CustomContainerImages.EdpmKeplerImage, defaults.EdpmKeplerImage),
159160
EdpmPodmanExporterImage: getImg(instance.Spec.CustomContainerImages.EdpmPodmanExporterImage, defaults.EdpmPodmanExporterImage),
160161
OpenstackNetworkExporterImage: getOpenstackNetworkExporterImg(instance.Spec.CustomContainerImages, defaults),

‎test/functional/ctlplane/openstackversion_controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ var _ = Describe("OpenStackVersion controller", func() {
136136
g.Expect(version.Status.ContainerImages.EdpmNeutronMetadataAgentImage).ShouldNot(BeNil())
137137
g.Expect(version.Status.ContainerImages.EdpmNeutronSriovAgentImage).ShouldNot(BeNil())
138138
g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil())
139-
g.Expect(version.Status.ContainerImages.EdpmKeplerImage).ShouldNot(BeNil())
139+
// EdpmKeplerImage is deprecated - Kepler has been removed from the telemetry stack
140140
g.Expect(version.Status.ContainerImages.EdpmPodmanExporterImage).ShouldNot(BeNil())
141141
g.Expect(version.Status.ContainerImages.OpenstackNetworkExporterImage).ShouldNot(BeNil())
142142
g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())

0 commit comments

Comments
 (0)