Skip to content

OPRUN-2892: Update service-monitor tls config #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 3, 2023
Merged

OPRUN-2892: Update service-monitor tls config #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions manifests/0000_90_olm_00-service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions scripts/generate_crds_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 6 additions & 0 deletions scripts/service-monitor.patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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