deploy/charts: Any monitoring configuration for the PrometheusRule/ServiceMonitor resources

Add a monitoring section to the helm chart values and update the
helm conditional check on the PrometheusRule and ServiceMonitor custom
resources to gate on wheterh monitoring has been enabled vs. whether the
platform is set to "ocp".

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

deploy/chart/templates/0000_90_olm_00-service-monitor.yaml

@@ -1,4 +1,4 @@
-{{ if and .Values.installType (eq .Values.installType "ocp") }}
+{{ if .Values.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
@@ -70,7 +70,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: prometheus-k8s
-  namespace: openshift-monitoring
+  namespace: {{ .Values.monitoring.namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role

deploy/chart/templates/0000_90_olm_01-prometheus-rule.yaml

@@ -1,4 +1,4 @@
-{{ if and .Values.installType (eq .Values.installType "ocp") }}
+{{ if .Values.monitoring.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:

deploy/chart/values.yaml

@@ -51,3 +51,7 @@ package:
     requests:
      cpu: 10m
      memory: 50Mi
+
+monitoring:
+  enabled: false
+  namespace: monitoring