diff --git a/manifests/0000_90_olm_00-service-monitor.yaml b/manifests/0000_90_olm_00-service-monitor.yaml index 710a551cf1..84f83198a0 100644 --- a/manifests/0000_90_olm_00-service-monitor.yaml +++ b/manifests/0000_90_olm_00-service-monitor.yaml @@ -59,6 +59,8 @@ spec: tlsConfig: caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt serverName: olm-operator-metrics.openshift-operator-lifecycle-manager.svc + keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key + certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt jobLabel: component namespaceSelector: matchNames: @@ -92,6 +94,8 @@ spec: tlsConfig: caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt serverName: catalog-operator-metrics.openshift-operator-lifecycle-manager.svc + keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key + certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt jobLabel: component namespaceSelector: matchNames: diff --git a/scripts/generate_crds_manifests.sh b/scripts/generate_crds_manifests.sh index 401e81ebc3..5ecbbc38d0 100755 --- a/scripts/generate_crds_manifests.sh +++ b/scripts/generate_crds_manifests.sh @@ -90,6 +90,8 @@ ${YQ} write --inplace -s scripts/olm-deployment.patch.yaml manifests/0000_50_olm ${YQ} write --inplace -s scripts/catalog-deployment.patch.yaml manifests/0000_50_olm_08-catalog-operator.deployment.yaml ${YQ} write --inplace -s scripts/packageserver-deployment.patch.yaml manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml ${YQ} merge --inplace manifests/0000_50_olm_02-olmconfig.yaml scripts/cluster-olmconfig.patch.yaml +${YQ} write --inplace -d'2' -s scripts/service-monitor.patch.yaml manifests/0000_90_olm_00-service-monitor.yaml +${YQ} write --inplace -d'3' -s scripts/service-monitor.patch.yaml manifests/0000_90_olm_00-service-monitor.yaml mv manifests/0000_50_olm_15-packageserver.clusterserviceversion.yaml pkg/manifests/csv.yaml cp scripts/packageserver-pdb.yaml manifests/0000_50_olm_00-packageserver.pdb.yaml diff --git a/scripts/service-monitor.patch.yaml b/scripts/service-monitor.patch.yaml new file mode 100644 index 0000000000..50c2f6bab1 --- /dev/null +++ b/scripts/service-monitor.patch.yaml @@ -0,0 +1,6 @@ +- command: update + path: spec.endpoints[*].tlsConfig.keyFile + value: /etc/prometheus/secrets/metrics-client-certs/tls.key +- command: update + path: spec.endpoints[*].tlsConfig.certFile + value: /etc/prometheus/secrets/metrics-client-certs/tls.crt \ No newline at end of file