Add PodMonitor resource for Prometheus monitoring

Add opendatahub.io/monitoring: 'true' label for odh/rhoai overlays.

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Author: alimaredia

config/overlays/odh/kustomization.yaml

@@ -13,11 +13,22 @@ namespace: opendatahub
 # 2. Import base configuration
 resources:
   - ../../default # Inherits everything from config/default/
+  - ../../prometheus
   - networkpolicy.yaml
 
 # 3. Delete the Namespace resource (ODH operator manages it)
+#    Add monitoring label to PodMonitor
 patches:
   - path: delete-namespace.yaml
+  - patch: |-
+      - op: add
+        path: /metadata/labels/opendatahub.io~1monitoring
+        value: "true"
+    target:
+      group: monitoring.coreos.com
+      version: v1
+      kind: PodMonitor
+      name: spark-operator-metrics-monitor
 
 # 4. Add ODH-specific labels
 labels:

config/overlays/rhoai/kustomization.yaml

@@ -13,11 +13,22 @@ namespace: redhat-ods-applications
 # 2. Import base configuration
 resources:
   - ../../default   # Inherits everything from config/default/
+  - ../../prometheus
   - networkpolicy.yaml
 
 # 3. Delete the Namespace resource (RHOAI operator manages it)
+#    Add monitoring label to PodMonitor
 patches:
   - path: delete-namespace.yaml
+  - patch: |-
+      - op: add
+        path: /metadata/labels/opendatahub.io~1monitoring
+        value: "true"
+    target:
+      group: monitoring.coreos.com
+      version: v1
+      kind: PodMonitor
+      name: spark-operator-metrics-monitor
 
 # 4. Add RHOAI-specific labels
 labels:

config/prometheus/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - podmonitor.yaml

config/prometheus/podmonitor.yaml

@@ -0,0 +1,14 @@
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: spark-operator-metrics-monitor
+  namespace: system
+spec:
+  podMetricsEndpoints:
+    - port: metrics
+      path: /metrics
+      scheme: http
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: spark-operator
+      app.kubernetes.io/component: controller

examples/openshift/Makefile

@@ -14,9 +14,13 @@ CONTEXT ?= $(REPO_ROOT)
 LOCALBIN := $(REPO_ROOT)/bin
 export PATH := $(LOCALBIN):$(PATH)
 
+# CLI tool: prefer oc if available, fall back to kubectl
+CLI ?= $(shell command -v oc 2>/dev/null || command -v kubectl 2>/dev/null)
+
 # Configuration
 KIND_CLUSTER_NAME ?= spark-operator
 CLEANUP ?= true
+PODMONITOR_CRD_URL ?= https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/main/jsonnet/prometheus-operator/podmonitors-crd.json
 
 ##@ General
 
@@ -80,8 +84,9 @@ test-docling-spark: ## Run Docling Spark test on KIND or OpenShift.
 	CLEANUP=$(CLEANUP) $(TESTS_DIR)/test-docling-spark.sh
 
 .PHONY: e2e-kustomize-test
-e2e-kustomize-test: ## Run Go e2e tests using Kustomize manifests for operator installation.
+e2e-kustomize-test: kind-setup ## Run Go e2e tests using Kustomize manifests for operator installation.
 	@echo "Running Go e2e tests with Kustomize installation..."
+	$(CLI) apply -f $(PODMONITOR_CRD_URL)
 	cd $(REPO_ROOT) && INSTALL_METHOD=kustomize go test ./examples/openshift/tests/e2e/ -v -ginkgo.v -timeout 30m
 
 .PHONY: test-all