Merge pull request #868 from openshift-cherrypick-robot/cherry-pick-846-to-18.0-fr5

openshift-merge-bot[bot] · web-flow · commit 181865555ad0 · 2026-04-06T07:55:47.000Z
[18.0-fr5] [OSPRH-26274] Add NodeSelector for MetricStorage
diff --git a/api/bases/telemetry.openstack.org_metricstorages.yaml b/api/bases/telemetry.openstack.org_metricstorages.yaml
@@ -1742,6 +1742,12 @@ spec:
                     default: true
                     description: AlertingEnabled allows to enable or disable alertmanager
                     type: boolean
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    description: NodeSelector to target subset of worker nodes running
+                      this service
+                    type: object
                   scrapeInterval:
                     default: 30s
                     description: ScrapeInterval sets the interval between scrapes
diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -3134,6 +3134,12 @@ spec:
                         default: true
                         description: AlertingEnabled allows to enable or disable alertmanager
                         type: boolean
+                      nodeSelector:
+                        additionalProperties:
+                          type: string
+                        description: NodeSelector to target subset of worker nodes
+                          running this service
+                        type: object
                       scrapeInterval:
                         default: 30s
                         description: ScrapeInterval sets the interval between scrapes
diff --git a/api/v1beta1/metricstorage_types.go b/api/v1beta1/metricstorage_types.go
@@ -76,6 +76,10 @@ type MonitoringStack struct {
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default={strategy: persistent, retention: "24h", persistent: {pvcStorageRequest: "20G"}}
 	Storage `json:"storage"`
+
+	// +kubebuilder:validation:Optional
+	// NodeSelector to target subset of worker nodes running this service
+	NodeSelector *map[string]string `json:"nodeSelector,omitempty"`
 }
 
 // MetricStorageSpec defines the desired state of MetricStorage
diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/telemetry.openstack.org_metricstorages.yaml b/config/crd/bases/telemetry.openstack.org_metricstorages.yaml
@@ -1742,6 +1742,12 @@ spec:
                     default: true
                     description: AlertingEnabled allows to enable or disable alertmanager
                     type: boolean
+                  nodeSelector:
+                    additionalProperties:
+                      type: string
+                    description: NodeSelector to target subset of worker nodes running
+                      this service
+                    type: object
                   scrapeInterval:
                     default: 30s
                     description: ScrapeInterval sets the interval between scrapes
diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -3134,6 +3134,12 @@ spec:
                         default: true
                         description: AlertingEnabled allows to enable or disable alertmanager
                         type: boolean
+                      nodeSelector:
+                        additionalProperties:
+                          type: string
+                        description: NodeSelector to target subset of worker nodes
+                          running this service
+                        type: object
                       scrapeInterval:
                         default: 30s
                         description: ScrapeInterval sets the interval between scrapes
diff --git a/internal/controller/telemetry_controller.go b/internal/controller/telemetry_controller.go
@@ -435,6 +435,10 @@ func (r TelemetryReconciler) reconcileMetricStorage(ctx context.Context, instanc
 		return ctrl.Result{}, nil
 	}
 
+	if instance.Spec.MetricStorage.MonitoringStack != nil && instance.Spec.MetricStorage.MonitoringStack.NodeSelector == nil {
+		instance.Spec.MetricStorage.MonitoringStack.NodeSelector = instance.Spec.NodeSelector
+	}
+
 	helper.GetLogger().Info("Reconciling MetricStorage", metricStorageNamespaceLabel, instance.Namespace, metricStorageNameLabel, telemetryv1.DefaultServiceName)
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), metricStorageInstance, func() error {
 		instance.Spec.MetricStorage.MetricStorageSpec.DeepCopyInto(&metricStorageInstance.Spec)
diff --git a/internal/metricstorage/monitoring_stack.go b/internal/metricstorage/monitoring_stack.go
@@ -62,6 +62,10 @@ func MonitoringStack(
 			},
 		},
 	}
+
+	if instance.Spec.MonitoringStack.NodeSelector != nil {
+		monitoringStack.Spec.NodeSelector = *instance.Spec.MonitoringStack.NodeSelector
+	}
 	return monitoringStack, nil
 }
 
diff --git a/test/kuttl/tests/default/01-assert.yaml b/test/kuttl/tests/default/01-assert.yaml
@@ -183,6 +183,10 @@ apiVersion: telemetry.openstack.org/v1beta1
 kind: MetricStorage
 metadata:
   name: metric-storage
+spec:
+  monitoringStack:
+    nodeSelector:
+      kubernetes.io/os: linux
 status:
   conditions:
     - type: Ready
diff --git a/test/kuttl/tests/default/01-deploy.yaml b/test/kuttl/tests/default/01-deploy.yaml
@@ -3,6 +3,8 @@ kind: Telemetry
 metadata:
   name: telemetry-kuttl
 spec:
+  nodeSelector:
+    kubernetes.io/os: linux
   metricStorage:
     enabled: true
     monitoringStack:

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ func MonitoringStack(`
`62`	`62`	`},`
`63`	`63`	`},`
`64`	`64`	`}`
	`65`	`+`
	`66`	`+ if instance.Spec.MonitoringStack.NodeSelector != nil {`
	`67`	`+ monitoringStack.Spec.NodeSelector = *instance.Spec.MonitoringStack.NodeSelector`
	`68`	`+ }`
`65`	`69`	`return monitoringStack, nil`
`66`	`70`	`}`
`67`	`71`