Merge pull request openstack-k8s-operators#1034 from yadneshk/deploy_…

…kepler Export environment variables for Kepler deployment
averdagu · Sep 20, 2024 · 98fbd73 · 98fbd73
2 parents 26a4939 + 90e6ab9
commit 98fbd73
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 1 deletion.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17583,6 +17583,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:

diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml
@@ -97,6 +97,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:
@@ -302,6 +304,8 @@ spec:
                       type: string
                     edpmIscsidImage:
                       type: string
+                    edpmKeplerImage:
+                      type: string
                     edpmLogrotateCrondImage:
                       type: string
                     edpmMultipathdImage:
@@ -478,6 +482,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:

diff --git a/apis/core/v1beta1/openstackversion_types.go b/apis/core/v1beta1/openstackversion_types.go
@@ -109,6 +109,7 @@ type ContainerTemplate struct {
 	EdpmNeutronSriovAgentImage    *string `json:"edpmNeutronSriovAgentImage,omitempty"`
 	EdpmOvnBgpAgentImage          *string `json:"edpmOvnBgpAgentImage,omitempty"`
 	EdpmNodeExporterImage         *string `json:"edpmNodeExporterImage,omitempty"`
+	EdpmKeplerImage               *string `json:"edpmKeplerImage,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
diff --git a/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go b/apis/dataplane/v1beta1/openstackdataplanenodeset_types.go
@@ -228,7 +228,8 @@ var ContainerImageDefaults = openstackv1.ContainerImages{
 		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/podified-antelope-centos9/openstack-telemetry-node-exporter:current-podified"),
+		EdpmNodeExporterImage:         getStrPtr("quay.io/prometheus/node-exporter:v1.5.0"),
+		EdpmKeplerImage:               getStrPtr("quay.io/sustainable_computing_io/kepler:release-0.7.11"),
 		OsContainerImage:              getStrPtr("quay.io/podified-antelope-centos9/edpm-hardened-uefi:current-podified"),
 	}}
 
@@ -253,6 +254,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),
+			EdpmKeplerImage:               getImageDefault("RELATED_IMAGE_EDPM_KEPLER_IMAGE_URL_DEFAULT", ContainerImageDefaults.EdpmKeplerImage),
 			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),

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -17583,6 +17583,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:

diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml
@@ -97,6 +97,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:
@@ -302,6 +304,8 @@ spec:
                       type: string
                     edpmIscsidImage:
                       type: string
+                    edpmKeplerImage:
+                      type: string
                     edpmLogrotateCrondImage:
                       type: string
                     edpmMultipathdImage:
@@ -478,6 +482,8 @@ spec:
                     type: string
                   edpmIscsidImage:
                     type: string
+                  edpmKeplerImage:
+                    type: string
                   edpmLogrotateCrondImage:
                     type: string
                   edpmMultipathdImage:

diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
@@ -81,6 +81,8 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified
         - name: RELATED_IMAGE_EDPM_NODE_EXPORTER_IMAGE_URL_DEFAULT
           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.11
         - name: RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
         - name: RELATED_IMAGE_GLANCE_API_IMAGE_URL_DEFAULT

diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_telemetry.yaml
@@ -16,3 +16,4 @@ spec:
   - CeilometerComputeImage
   - CeilometerIpmiImage
   - EdpmNodeExporterImage
+  - EdpmKeplerImage
diff --git a/docs/assemblies/common_configurations.adoc b/docs/assemblies/common_configurations.adoc
@@ -69,6 +69,7 @@ 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
@@ -93,6 +94,7 @@ 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
@@ -1963,6 +1963,11 @@ ContainerTemplate - struct that contains container image URLs for each service i
 | *string
 | false
 
+| edpmKeplerImage
+|
+| *string
+| false
+
 | glanceAPIImage
 |
 | *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
@@ -276,6 +276,7 @@ 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"
@@ -289,6 +290,7 @@ 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/hack/export_related_images.sh b/hack/export_related_images.sh
@@ -80,6 +80,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_KEPLER_IMAGE_URL_DEFAULT=quay.io/sustainable_computing_io/kepler:release-0.7.11
 export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
 export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
 export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified

diff --git a/pkg/dataplane/inventory.go b/pkg/dataplane/inventory.go
@@ -299,6 +299,9 @@ 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
+	}
 
 	err := unmarshalAnsibleVars(template.Ansible.AnsibleVars, group.Vars)
 	if err != nil {

diff --git a/pkg/dataplane/util/version.go b/pkg/dataplane/util/version.go
@@ -72,6 +72,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
+		containerImages.EdpmKeplerImage = version.Status.ContainerImages.EdpmKeplerImage
 		containerImages.EdpmOvnBgpAgentImage = version.Status.ContainerImages.EdpmOvnBgpAgentImage
 		containerImages.NovaComputeImage = version.Status.ContainerImages.NovaComputeImage
 		containerImages.OvnControllerImage = version.Status.ContainerImages.OvnControllerImage
@@ -91,6 +92,7 @@ func GetContainerImages(version *openstackv1.OpenStackVersion) openstackv1.Conta
 		containerImages.EdpmNeutronOvnAgentImage = dataplanev1.ContainerImages.EdpmNeutronOvnAgentImage
 		containerImages.EdpmNeutronSriovAgentImage = dataplanev1.ContainerImages.EdpmNeutronSriovAgentImage
 		containerImages.EdpmNodeExporterImage = dataplanev1.ContainerImages.EdpmNodeExporterImage
+		containerImages.EdpmKeplerImage = dataplanev1.ContainerImages.EdpmKeplerImage
 		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
@@ -118,6 +118,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),
+			EdpmKeplerImage:               getImg(instance.Spec.CustomContainerImages.EdpmKeplerImage, defaults.EdpmKeplerImage),
 			GlanceAPIImage:                getImg(instance.Spec.CustomContainerImages.GlanceAPIImage, defaults.GlanceAPIImage),
 			HeatAPIImage:                  getImg(instance.Spec.CustomContainerImages.HeatAPIImage, defaults.HeatAPIImage),
 			HeatCfnapiImage:               getImg(instance.Spec.CustomContainerImages.HeatCfnapiImage, defaults.HeatCfnapiImage),

diff --git a/tests/functional/ctlplane/openstackversion_controller_test.go b/tests/functional/ctlplane/openstackversion_controller_test.go
@@ -131,6 +131,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())
 				g.Expect(version.Status.ContainerImages.EdpmOvnBgpAgentImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.GlanceAPIImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.HeatAPIImage).ShouldNot(BeNil())
@@ -175,6 +176,7 @@ var _ = Describe("OpenStackOperator controller", func() {
 				g.Expect(version.Status.ContainerImages.SwiftObjectImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.SwiftProxyImage).ShouldNot(BeNil())
 				g.Expect(version.Status.ContainerImages.EdpmNodeExporterImage).ShouldNot(BeNil())
+				g.Expect(version.Status.ContainerImages.EdpmKeplerImage).ShouldNot(BeNil())
 
 			}, timeout, interval).Should(Succeed())
 		})