Merge pull request #318 from jlarriba/node-exporter-image

openshift-merge-bot[bot] · web-flow · commit 0d4f1ece1c02 · 2024-02-27T14:29:52.000Z
NODE_EXPORTER image here was not used in the compute nodes ansible
diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -63,8 +63,6 @@ spec:
                 items:
                   type: string
                 type: array
-              nodeExporterImage:
-                type: string
               notificationImage:
                 type: string
               passwordSelector:
@@ -109,7 +107,6 @@ spec:
             - centralImage
             - computeImage
             - ipmiImage
-            - nodeExporterImage
             - notificationImage
             - secret
             - sgCoreImage
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -374,8 +374,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  nodeExporterImage:
-                    type: string
                   notificationImage:
                     type: string
                   passwordSelector:
@@ -420,7 +418,6 @@ spec:
                 - centralImage
                 - computeImage
                 - ipmiImage
-                - nodeExporterImage
                 - notificationImage
                 - secret
                 - sgCoreImage
diff --git a/api/v1beta1/ceilometer_types.go b/api/v1beta1/ceilometer_types.go
@@ -34,9 +34,6 @@ const (
 	CeilometerComputeContainerImage = "quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified"
 	// CeilometerIpmiContainerImage - default fall-back image for Ceilometer Ipmi
 	CeilometerIpmiContainerImage = "quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified"
-	// NodeExporterContainerImage - default fall-back image for node_exporter
-	// NodeExporterContainerImage = "registry.redhat.io/openshift4/ose-prometheus-node-exporter:v4.13"
-	NodeExporterContainerImage = "quay.io/prometheus/node-exporter:v1.5.0"
 )
 
 // CeilometerSpec defines the desired state of Ceilometer
@@ -87,9 +84,6 @@ type CeilometerSpec struct {
 
 	// +kubebuilder:validation:Required
 	IpmiImage string `json:"ipmiImage"`
-
-	// +kubebuilder:validation:Required
-	NodeExporterImage string `json:"nodeExporterImage"`
 }
 
 // CeilometerStatus defines the observed state of Ceilometer
diff --git a/api/v1beta1/ceilometer_webhook.go b/api/v1beta1/ceilometer_webhook.go
@@ -82,9 +82,6 @@ func (spec *CeilometerSpec) Default() {
 	if spec.IpmiImage == "" {
 		spec.IpmiImage = ceilometerDefaults.IpmiContainerImageURL
 	}
-	if spec.NodeExporterImage == "" {
-		spec.NodeExporterImage = ceilometerDefaults.NodeExporterContainerImageURL
-	}
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
diff --git a/api/v1beta1/telemetry_types.go b/api/v1beta1/telemetry_types.go
@@ -165,7 +165,6 @@ func SetupDefaultsTelemetry() {
 		ComputeContainerImageURL:       util.GetEnvVar("RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT", CeilometerComputeContainerImage),
 		IpmiContainerImageURL:          util.GetEnvVar("RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT", CeilometerIpmiContainerImage),
 		NotificationContainerImageURL:  util.GetEnvVar("RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT", CeilometerNotificationContainerImage),
-		NodeExporterContainerImageURL:  util.GetEnvVar("RELATED_IMAGE_TELEMETRY_NODE_EXPORTER_IMAGE_URL_DEFAULT", NodeExporterContainerImage),
 		SgCoreContainerImageURL:        util.GetEnvVar("RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT", CeilometerSgCoreContainerImage),
 
 		// Autoscaling
diff --git a/api/v1beta1/telemetry_webhook.go b/api/v1beta1/telemetry_webhook.go
@@ -33,7 +33,6 @@ type TelemetryDefaults struct {
 	ComputeContainerImageURL       string
 	NotificationContainerImageURL  string
 	SgCoreContainerImageURL        string
-	NodeExporterContainerImageURL  string
 	IpmiContainerImageURL          string
 	AodhAPIContainerImageURL       string
 	AodhEvaluatorContainerImageURL string
@@ -88,9 +87,6 @@ func (spec *TelemetrySpec) Default() {
 	if spec.Ceilometer.CeilometerSpec.SgCoreImage == "" {
 		spec.Ceilometer.CeilometerSpec.SgCoreImage = telemetryDefaults.SgCoreContainerImageURL
 	}
-	if spec.Ceilometer.CeilometerSpec.NodeExporterImage == "" {
-		spec.Ceilometer.CeilometerSpec.NodeExporterImage = telemetryDefaults.NodeExporterContainerImageURL
-	}
 	if spec.Autoscaling.AutoscalingSpec.Aodh.APIImage == "" {
 		spec.Autoscaling.AutoscalingSpec.Aodh.APIImage = telemetryDefaults.AodhAPIContainerImageURL
 	}
diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -63,8 +63,6 @@ spec:
                 items:
                   type: string
                 type: array
-              nodeExporterImage:
-                type: string
               notificationImage:
                 type: string
               passwordSelector:
@@ -109,7 +107,6 @@ spec:
             - centralImage
             - computeImage
             - ipmiImage
-            - nodeExporterImage
             - notificationImage
             - secret
             - sgCoreImage
diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -374,8 +374,6 @@ spec:
                     items:
                       type: string
                     type: array
-                  nodeExporterImage:
-                    type: string
                   notificationImage:
                     type: string
                   passwordSelector:
@@ -420,7 +418,6 @@ spec:
                 - centralImage
                 - computeImage
                 - ipmiImage
-                - nodeExporterImage
                 - notificationImage
                 - secret
                 - sgCoreImage
diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml
@@ -21,8 +21,6 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
         - name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT
           value: quay.io/infrawatch/sg-core:v5.2.0-nextgen
-        - name: RELATED_IMAGE_TELEMETRY_NODE_EXPORTER_IMAGE_URL_DEFAULT
-          value: quay.io/prometheus/node-exporter:v1.5.0
         - name: RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
         - name: RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT
diff --git a/controllers/ceilometer_controller.go b/controllers/ceilometer_controller.go
@@ -570,7 +570,6 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(
 		"CeilometerPassword":            string(ceilometerPasswordSecret.Data["CeilometerPassword"]),
 		"ceilometer_compute_image":      instance.Spec.ComputeImage,
 		"ceilometer_ipmi_image":         instance.Spec.IpmiImage,
-		"telemetry_node_exporter_image": instance.Spec.NodeExporterImage,
 	}
 
 	cms := []util.Template{

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,6 @@ func (spec *CeilometerSpec) Default() {`
`82`	`82`	`if spec.IpmiImage == "" {`
`83`	`83`	`spec.IpmiImage = ceilometerDefaults.IpmiContainerImageURL`
`84`	`84`	`}`
`85`		`- if spec.NodeExporterImage == "" {`
`86`		`- spec.NodeExporterImage = ceilometerDefaults.NodeExporterContainerImageURL`
`87`		`- }`
`88`	`85`	`}`
`89`	`86`
`90`	`87`	`// TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,6 @@ func (r *CeilometerReconciler) generateComputeServiceConfig(`
`570`	`570`	`"CeilometerPassword": string(ceilometerPasswordSecret.Data["CeilometerPassword"]),`
`571`	`571`	`"ceilometer_compute_image": instance.Spec.ComputeImage,`
`572`	`572`	`"ceilometer_ipmi_image": instance.Spec.IpmiImage,`
`573`		`- "telemetry_node_exporter_image": instance.Spec.NodeExporterImage,`
`574`	`573`	`}`
`575`	`574`
`576`	`575`	`cms := []util.Template{`