Skip to content

Commit de0c3d2

Browse files
author
Jeff Peeler
committed
fix(deploy): move service creation to new file
This allows the certificates to be created before the deployments that reference them.
1 parent 85776e9 commit de0c3d2

File tree

2 files changed

+38
-33
lines changed

2 files changed

+38
-33
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
apiVersion: v1
2+
kind: Service
3+
metadata:
4+
name: olm-operator-metrics
5+
namespace: {{ .Values.namespace }}
6+
annotations:
7+
service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
8+
labels:
9+
app: olm-operator
10+
spec:
11+
type: ClusterIP
12+
ports:
13+
- name: https-metrics
14+
port: 8081
15+
protocol: TCP
16+
targetPort: metrics
17+
selector:
18+
app: olm-operator
19+
---
20+
apiVersion: v1
21+
kind: Service
22+
metadata:
23+
name: catalog-operator-metrics
24+
namespace: {{ .Values.namespace }}
25+
annotations:
26+
service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
27+
labels:
28+
app: catalog-operator
29+
spec:
30+
type: ClusterIP
31+
ports:
32+
- name: https-metrics
33+
port: 8081
34+
protocol: TCP
35+
targetPort: metrics
36+
selector:
37+
app: catalog-operator

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

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,6 @@ spec:
2727
matchLabels:
2828
app: olm-operator
2929
---
30-
apiVersion: v1
31-
kind: Service
32-
metadata:
33-
name: olm-operator
34-
namespace: {{ .Values.namespace }}
35-
labels:
36-
app: olm-operator
37-
spec:
38-
ports:
39-
- name: http-metrics
40-
port: 8081
41-
protocol: TCP
42-
targetPort: http
43-
selector:
44-
app: olm-operator
45-
---
4630
apiVersion: monitoring.coreos.com/v1
4731
kind: ServiceMonitor
4832
metadata:
@@ -73,22 +57,6 @@ spec:
7357
matchLabels:
7458
app: catalog-operator
7559
---
76-
apiVersion: v1
77-
kind: Service
78-
metadata:
79-
name: catalog-operator
80-
namespace: {{ .Values.namespace }}
81-
labels:
82-
app: catalog-operator
83-
spec:
84-
ports:
85-
- name: http-metrics
86-
port: 8081
87-
protocol: TCP
88-
targetPort: http
89-
selector:
90-
app: catalog-operator
91-
---
9260
apiVersion: rbac.authorization.k8s.io/v1
9361
kind: RoleBinding
9462
metadata:
@@ -118,4 +86,4 @@ rules:
11886
verbs:
11987
- get
12088
- list
121-
- watch
89+
- watch

0 commit comments

Comments
 (0)