Configure metrics scraping

manifests/0000_90_cluster-storage-operator_01_prometheusrbac.yaml

@@ -0,0 +1,32 @@
+# Role for accessing metrics exposed by the cluster-storage-operator
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: prometheus
+  namespace: openshift-cluster-storage-operator
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - services
+  - endpoints
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+---
+# Grant cluster-monitoring access to openshift-cluster-storage-operator metrics
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: prometheus
+  namespace: openshift-cluster-storage-operator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: prometheus
+subjects:
+- kind: ServiceAccount
+  name: prometheus-k8s
+  namespace: openshift-monitoring

manifests/0000_90_cluster-storage-operator_02_servicemonitor.yaml

@@ -0,0 +1,20 @@
+# Configure cluster-monitoring for cluster-storage-operator
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: cluster-storage-operator
+  namespace: openshift-cluster-storage-operator
+spec:
+  endpoints:
+  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
+    interval: 30s
+    path: /metrics
+    port: https
+    scheme: https
+    tlsConfig:
+      caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
+      serverName: metrics.openshift-cluster-storage-operator.svc
+  jobLabel: component
+  selector:
+    matchLabels:
+      name: cluster-storage-operator

manifests/09_metrics_service.yaml

@@ -0,0 +1,23 @@
+# Expose operator metrics
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    include.release.openshift.io/ibm-cloud-managed: "true"
+    include.release.openshift.io/self-managed-high-availability: "true"
+    include.release.openshift.io/single-node-developer: "true"
+    service.alpha.openshift.io/serving-cert-secret-name: serving-cert
+  labels:
+    app: cluster-storage-operator
+  name: metrics
+  namespace: openshift-cluster-storage-operator
+spec:
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: 8443
+  selector:
+    name: cluster-storage-operator
+  sessionAffinity: None
+  type: ClusterIP

manifests/09_deployment.yaml → manifests/10_deployment.yaml

@@ -36,7 +36,7 @@ spec:
           image: quay.io/openshift/origin-cluster-storage-operator:latest
           terminationMessagePolicy: FallbackToLogsOnError
           ports:
-          - containerPort: 60000
+          - containerPort: 8443
             name: metrics
           command:
           - cluster-storage-operator
@@ -85,3 +85,11 @@ spec:
             requests:
               cpu: 10m
               memory: 20Mi
+          volumeMounts:
+            - mountPath: /var/run/secrets/serving-cert
+              name: serving-cert
+      volumes:
+        - name: serving-cert
+          secret:
+            secretName: serving-cert
+            optional: true