Skip to content

Commit 39145b8

Browse files
camilamacedo86camilamacedo86
committed
Revert "Add OpenShift service-ca support for authenticated metrics endpoints (#3677)"
This reverts commit 971d680.
1 parent 971d680 commit 39145b8

File tree

5 files changed

+23
-67
lines changed

5 files changed

+23
-67
lines changed

‎deploy/chart/templates/0000_50_olm_02-olm-operator.serviceaccount.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ rules:
88
verbs: ["watch", "list", "get", "create", "update", "patch", "delete", "deletecollection", "escalate", "bind"]
99
- nonResourceURLs: ["*"]
1010
verbs: ["*"]
11-
- apiGroups:
12-
- authentication.k8s.io
13-
resources:
14-
- tokenreviews
15-
verbs:
16-
- create
17-
- apiGroups:
18-
- authorization.k8s.io
19-
resources:
20-
- subjectaccessreviews
21-
verbs:
22-
- create
2311
---
2412
kind: ServiceAccount
2513
apiVersion: v1

‎deploy/chart/templates/0000_50_olm_03-services.yaml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,39 @@
1-
{{- if or .Values.monitoring.enabled .Values.serviceCa.enabled }}
1+
{{ if .Values.monitoring.enabled }}
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ .Values.olm.service.name }}
5+
name: olm-operator-metrics
66
namespace: {{ .Values.namespace }}
7-
{{- if .Values.serviceCa.enabled }}
87
annotations:
9-
service.alpha.openshift.io/serving-cert-secret-name: {{ .Values.serviceCa.olmOperator.secretName }}
10-
{{- end }}
8+
service.alpha.openshift.io/serving-cert-secret-name: olm-operator-serving-cert
119
labels:
1210
app: olm-operator
1311
spec:
1412
type: ClusterIP
1513
ports:
1614
- name: https-metrics
17-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.externalPort }}{{ end }}
15+
port: {{ .Values.olm.service.externalPort }}
1816
protocol: TCP
19-
targetPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
17+
targetPort: {{ .Values.olm.service.internalPort }}
2018
selector:
2119
app: olm-operator
2220
---
2321
apiVersion: v1
2422
kind: Service
2523
metadata:
26-
name: {{ .Values.catalog.service.name }}
24+
name: catalog-operator-metrics
2725
namespace: {{ .Values.namespace }}
28-
{{- if .Values.serviceCa.enabled }}
2926
annotations:
30-
service.alpha.openshift.io/serving-cert-secret-name: {{ .Values.serviceCa.catalogOperator.secretName }}
31-
{{- end }}
27+
service.alpha.openshift.io/serving-cert-secret-name: catalog-operator-serving-cert
3228
labels:
3329
app: catalog-operator
3430
spec:
3531
type: ClusterIP
3632
ports:
3733
- name: https-metrics
38-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.externalPort }}{{ end }}
34+
port: {{ .Values.catalog.service.externalPort }}
3935
protocol: TCP
40-
targetPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
36+
targetPort: {{ .Values.catalog.service.internalPort }}
4137
selector:
4238
app: catalog-operator
4339
{{ end }}

‎deploy/chart/templates/0000_50_olm_07-olm-operator.deployment.yaml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ spec:
3030
- name: profile-collector-cert
3131
secret:
3232
secretName: {{ .Values.certManager.certificate.secretName }}
33-
{{- else if .Values.serviceCa.enabled }}
34-
- name: srv-cert
35-
secret:
36-
secretName: {{ .Values.serviceCa.olmOperator.secretName }}
37-
- name: profile-collector-cert
38-
secret:
39-
secretName: {{ .Values.serviceCa.olmOperator.secretName }}
4033
{{- end }}
4134
- name: tmpfs
4235
emptyDir: {}
@@ -48,7 +41,7 @@ spec:
4841
capabilities:
4942
drop: [ "ALL" ]
5043
volumeMounts:
51-
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
44+
{{- if .Values.certManager.enabled }}
5245
- name: srv-cert
5346
mountPath: "/srv-cert"
5447
readOnly: true
@@ -81,7 +74,7 @@ spec:
8174
- --writePackageServerStatusName
8275
- {{ .Values.writePackageServerStatusName }}
8376
{{- end }}
84-
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
77+
{{- if .Values.certManager.enabled }}
8578
- --tls-cert
8679
- /srv-cert/tls.crt
8780
- --tls-key
@@ -92,18 +85,18 @@ spec:
9285
image: {{ .Values.olm.image.ref }}
9386
imagePullPolicy: {{ .Values.olm.image.pullPolicy }}
9487
ports:
95-
- containerPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
88+
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
9689
name: metrics
9790
livenessProbe:
9891
httpGet:
9992
path: /healthz
100-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
101-
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
93+
port: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
94+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
10295
readinessProbe:
10396
httpGet:
10497
path: /healthz
105-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
106-
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
98+
port: {{ if .Values.certManager.enabled }}{{ .Values.olm.service.internalPortHttps }}{{ else }}{{ .Values.olm.service.internalPort }}{{ end }}
99+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
107100
terminationMessagePolicy: FallbackToLogsOnError
108101
env:
109102
- name: OPERATOR_NAMESPACE

‎deploy/chart/templates/0000_50_olm_08-catalog-operator.deployment.yaml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ spec:
3030
- name: profile-collector-cert
3131
secret:
3232
secretName: {{ .Values.certManager.certificate.secretName }}
33-
{{- else if .Values.serviceCa.enabled }}
34-
- name: srv-cert
35-
secret:
36-
secretName: {{ .Values.serviceCa.catalogOperator.secretName }}
37-
- name: profile-collector-cert
38-
secret:
39-
secretName: {{ .Values.serviceCa.catalogOperator.secretName }}
4033
{{- end }}
4134
- name: tmpfs
4235
emptyDir: {}
@@ -48,7 +41,7 @@ spec:
4841
capabilities:
4942
drop: [ "ALL" ]
5043
volumeMounts:
51-
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
44+
{{- if .Values.certManager.enabled }}
5245
- name: srv-cert
5346
mountPath: "/srv-cert"
5447
readOnly: true
@@ -78,7 +71,7 @@ spec:
7871
- --writeStatusName
7972
- {{ .Values.writeStatusNameCatalog }}
8073
{{- end }}
81-
{{- if or .Values.certManager.enabled .Values.serviceCa.enabled }}
74+
{{- if .Values.certManager.enabled }}
8275
- --tls-cert
8376
- /srv-cert/tls.crt
8477
- --tls-key
@@ -99,18 +92,18 @@ spec:
9992
{{- end }}
10093
imagePullPolicy: {{ .Values.catalog.image.pullPolicy }}
10194
ports:
102-
- containerPort: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
95+
- containerPort: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
10396
name: metrics
10497
livenessProbe:
10598
httpGet:
10699
path: /healthz
107-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
108-
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
100+
port: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
101+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
109102
readinessProbe:
110103
httpGet:
111104
path: /healthz
112-
port: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
113-
scheme: {{ if or .Values.certManager.enabled .Values.serviceCa.enabled }}HTTPS{{ else }}HTTP{{ end }}
105+
port: {{ if .Values.certManager.enabled }}{{ .Values.catalog.service.internalPortHttps }}{{ else }}{{ .Values.catalog.service.internalPort }}{{ end }}
106+
scheme: {{ if .Values.certManager.enabled }}HTTPS{{ else }}HTTP{{ end }}
114107
terminationMessagePolicy: FallbackToLogsOnError
115108
{{- if .Values.catalog.resources }}
116109
resources:

‎deploy/chart/values.yaml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ olm:
2727
ref: quay.io/operator-framework/olm:master
2828
pullPolicy: Always
2929
service:
30-
name: olm-operator-metrics
3130
internalPort: 8080
3231
internalPortHttps: 8443
3332
externalPort: metrics
@@ -47,7 +46,6 @@ catalog:
4746
ref: quay.io/operator-framework/olm:master
4847
pullPolicy: Always
4948
service:
50-
name: catalog-operator-metrics
5149
internalPort: 8080
5250
internalPortHttps: 8443
5351
externalPort: metrics
@@ -91,18 +89,6 @@ certManager:
9189
extraDnsNames: []
9290
extraIpAddresses: []
9391

94-
# OpenShift service-ca configuration
95-
# When enabled, uses OpenShift service-ca-operator for certificate management
96-
# This is mutually exclusive with certManager - only one should be enabled
97-
serviceCa:
98-
enabled: false
99-
# Secret names are left empty in upstream, to be filled by downstream values.yaml
100-
# Service names are taken from olm.service.name and catalog.service.name
101-
olmOperator:
102-
secretName: ""
103-
catalogOperator:
104-
secretName: ""
105-
10692
networkPolicy:
10793
dns:
10894
ports:

0 commit comments

Comments
 (0)