diff --git a/deploy/csv-templates/ocs-operator.csv.yaml.in b/deploy/csv-templates/ocs-operator.csv.yaml.in index 3a8cb4d7be..417207295b 100644 --- a/deploy/csv-templates/ocs-operator.csv.yaml.in +++ b/deploy/csv-templates/ocs-operator.csv.yaml.in @@ -79,7 +79,7 @@ metadata: "spec": null } ] - createdAt: "2025-09-29T20:14:19Z" + createdAt: "2025-10-07T07:01:08Z" description: Red Hat OpenShift Container Storage provides hyperconverged storage for applications within an OpenShift cluster. operators.operatorframework.io/builder: operator-sdk-v1.30.0 diff --git a/deploy/ocs-operator/manifests/cluster_monitoring_view_prometheus_k8s_role_binding.yaml b/deploy/ocs-operator/manifests/cluster_monitoring_view_prometheus_k8s_role_binding.yaml new file mode 100644 index 0000000000..08f32c11df --- /dev/null +++ b/deploy/ocs-operator/manifests/cluster_monitoring_view_prometheus_k8s_role_binding.yaml @@ -0,0 +1,12 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: prometheus-k8s-cluster-monitoring-view +subjects: +- kind: ServiceAccount + name: prometheus-k8s + namespace: openshift-storage +roleRef: + kind: ClusterRole + name: cluster-monitoring-view + apiGroup: rbac.authorization.k8s.io diff --git a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml index eb7c28d6cf..c3e5c4792e 100644 --- a/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml +++ b/deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml @@ -56,7 +56,7 @@ metadata: capabilities: Deep Insights categories: Storage containerImage: quay.io/ocs-dev/ocs-operator:latest - createdAt: "2025-09-29T20:14:19Z" + createdAt: "2025-10-07T07:01:08Z" description: Red Hat OpenShift Container Storage provides hyperconverged storage for applications within an OpenShift cluster. external.features.ocs.openshift.io/supported-platforms: '["BareMetal", "None", diff --git a/rbac/cluster_monitoring_view_prometheus_k8s_role_binding.yaml b/rbac/cluster_monitoring_view_prometheus_k8s_role_binding.yaml new file mode 100644 index 0000000000..08f32c11df --- /dev/null +++ b/rbac/cluster_monitoring_view_prometheus_k8s_role_binding.yaml @@ -0,0 +1,12 @@ +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: prometheus-k8s-cluster-monitoring-view +subjects: +- kind: ServiceAccount + name: prometheus-k8s + namespace: openshift-storage +roleRef: + kind: ClusterRole + name: cluster-monitoring-view + apiGroup: rbac.authorization.k8s.io diff --git a/templates/k8smetricsservicemonitor.go b/templates/k8smetricsservicemonitor.go index 2f0d61d4ee..516d75e8fe 100644 --- a/templates/k8smetricsservicemonitor.go +++ b/templates/k8smetricsservicemonitor.go @@ -52,8 +52,10 @@ var K8sMetricsServiceMonitorSpecTemplate = promv1.ServiceMonitorSpec{ }, TLSConfig: &promv1.TLSConfig{ SafeTLSConfig: promv1.SafeTLSConfig{ - InsecureSkipVerify: ptr.To(true), + InsecureSkipVerify: ptr.To(false), + ServerName: ptr.To("prometheus-k8s.openshift-monitoring.svc"), }, + CAFile: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt", }, Params: params, BearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",