Skip to content

Commit 11da6c7

Browse files
author
Ricardo Lüders
authored
chore(manifests): adding insights capability annotations (#646)
* chore(manifests): adding insights capability annotations * chore(manifests): removes capability from specs * chore(manifests): capability name to PascalCase format
1 parent a637577 commit 11da6c7

13 files changed

+29
-7
lines changed

manifests/02-namespace.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
include.release.openshift.io/ibm-cloud-managed: "true"
99
include.release.openshift.io/single-node-developer: "true"
1010
workload.openshift.io/allowed: "management"
11+
capability.openshift.io/name: Insights
1112
labels:
1213
openshift.io/cluster-monitoring: "true"
1314
name: openshift-insights

manifests/03-clusterrole.yaml

+16-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
include.release.openshift.io/self-managed-high-availability: "true"
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/single-node-developer: "true"
9+
capability.openshift.io/name: Insights
910
roleRef:
1011
kind: ClusterRole
1112
name: system:auth-delegator
@@ -23,6 +24,7 @@ metadata:
2324
include.release.openshift.io/self-managed-high-availability: "true"
2425
include.release.openshift.io/ibm-cloud-managed: "true"
2526
include.release.openshift.io/single-node-developer: "true"
27+
capability.openshift.io/name: Insights
2628
roleRef:
2729
kind: Role
2830
name: extension-apiserver-authentication-reader
@@ -31,7 +33,6 @@ subjects:
3133
namespace: openshift-insights
3234
name: operator
3335
---
34-
3536
apiVersion: rbac.authorization.k8s.io/v1
3637
kind: ClusterRole
3738
metadata:
@@ -40,6 +41,7 @@ metadata:
4041
include.release.openshift.io/self-managed-high-availability: "true"
4142
include.release.openshift.io/ibm-cloud-managed: "true"
4243
include.release.openshift.io/single-node-developer: "true"
44+
capability.openshift.io/name: Insights
4345
rules:
4446
# allow the operator to update cluster operator status
4547
- apiGroups:
@@ -74,7 +76,6 @@ rules:
7476
- namespaces
7577
verbs:
7678
- get
77-
7879
---
7980
apiVersion: rbac.authorization.k8s.io/v1
8081
kind: RoleBinding
@@ -85,16 +86,15 @@ metadata:
8586
include.release.openshift.io/self-managed-high-availability: "true"
8687
include.release.openshift.io/ibm-cloud-managed: "true"
8788
include.release.openshift.io/single-node-developer: "true"
89+
capability.openshift.io/name: Insights
8890
roleRef:
8991
kind: Role
9092
name: monitoring-alertmanager-edit
9193
subjects:
9294
- kind: ServiceAccount
9395
namespace: openshift-insights
9496
name: operator
95-
9697
---
97-
9898
---
9999
apiVersion: rbac.authorization.k8s.io/v1
100100
kind: ClusterRoleBinding
@@ -104,14 +104,14 @@ metadata:
104104
include.release.openshift.io/self-managed-high-availability: "true"
105105
include.release.openshift.io/ibm-cloud-managed: "true"
106106
include.release.openshift.io/single-node-developer: "true"
107+
capability.openshift.io/name: Insights
107108
roleRef:
108109
kind: ClusterRole
109110
name: insights-operator
110111
subjects:
111112
- kind: ServiceAccount
112113
namespace: openshift-insights
113114
name: operator
114-
115115
---
116116
apiVersion: rbac.authorization.k8s.io/v1
117117
kind: ClusterRole
@@ -121,6 +121,7 @@ metadata:
121121
include.release.openshift.io/self-managed-high-availability: "true"
122122
include.release.openshift.io/ibm-cloud-managed: "true"
123123
include.release.openshift.io/single-node-developer: "true"
124+
capability.openshift.io/name: Insights
124125
rules:
125126
- apiGroups:
126127
- ""
@@ -279,14 +280,14 @@ metadata:
279280
include.release.openshift.io/self-managed-high-availability: "true"
280281
include.release.openshift.io/ibm-cloud-managed: "true"
281282
include.release.openshift.io/single-node-developer: "true"
283+
capability.openshift.io/name: Insights
282284
roleRef:
283285
kind: ClusterRole
284286
name: insights-operator-gather
285287
subjects:
286288
- kind: ServiceAccount
287289
namespace: openshift-insights
288290
name: gather
289-
290291
---
291292
apiVersion: rbac.authorization.k8s.io/v1
292293
kind: ClusterRoleBinding
@@ -296,6 +297,7 @@ metadata:
296297
include.release.openshift.io/self-managed-high-availability: "true"
297298
include.release.openshift.io/ibm-cloud-managed: "true"
298299
include.release.openshift.io/single-node-developer: "true"
300+
capability.openshift.io/name: Insights
299301
roleRef:
300302
kind: ClusterRole
301303
name: cluster-reader
@@ -314,6 +316,7 @@ metadata:
314316
include.release.openshift.io/self-managed-high-availability: "true"
315317
include.release.openshift.io/ibm-cloud-managed: "true"
316318
include.release.openshift.io/single-node-developer: "true"
319+
capability.openshift.io/name: Insights
317320
rules:
318321
- apiGroups:
319322
- ""
@@ -335,14 +338,14 @@ metadata:
335338
include.release.openshift.io/self-managed-high-availability: "true"
336339
include.release.openshift.io/ibm-cloud-managed: "true"
337340
include.release.openshift.io/single-node-developer: "true"
341+
capability.openshift.io/name: Insights
338342
roleRef:
339343
kind: Role
340344
name: insights-operator
341345
subjects:
342346
- kind: ServiceAccount
343347
name: operator
344348
namespace: openshift-insights
345-
346349
---
347350
apiVersion: rbac.authorization.k8s.io/v1
348351
kind: Role
@@ -353,6 +356,7 @@ metadata:
353356
include.release.openshift.io/self-managed-high-availability: "true"
354357
include.release.openshift.io/ibm-cloud-managed: "true"
355358
include.release.openshift.io/single-node-developer: "true"
359+
capability.openshift.io/name: Insights
356360
rules:
357361
- apiGroups:
358362
- ""
@@ -378,6 +382,7 @@ metadata:
378382
include.release.openshift.io/self-managed-high-availability: "true"
379383
include.release.openshift.io/ibm-cloud-managed: "true"
380384
include.release.openshift.io/single-node-developer: "true"
385+
capability.openshift.io/name: Insights
381386
roleRef:
382387
kind: Role
383388
name: insights-operator
@@ -395,6 +400,7 @@ metadata:
395400
include.release.openshift.io/self-managed-high-availability: "true"
396401
include.release.openshift.io/ibm-cloud-managed: "true"
397402
include.release.openshift.io/single-node-developer: "true"
403+
capability.openshift.io/name: Insights
398404
rules:
399405
- apiGroups:
400406
- ''
@@ -417,6 +423,7 @@ metadata:
417423
include.release.openshift.io/self-managed-high-availability: "true"
418424
include.release.openshift.io/ibm-cloud-managed: "true"
419425
include.release.openshift.io/single-node-developer: "true"
426+
capability.openshift.io/name: Insights
420427
subjects:
421428
- kind: ServiceAccount
422429
name: operator
@@ -434,6 +441,7 @@ metadata:
434441
include.release.openshift.io/self-managed-high-availability: "true"
435442
include.release.openshift.io/ibm-cloud-managed: "true"
436443
include.release.openshift.io/single-node-developer: "true"
444+
capability.openshift.io/name: Insights
437445
rules:
438446
- apiGroups:
439447
- ''
@@ -456,6 +464,7 @@ metadata:
456464
include.release.openshift.io/self-managed-high-availability: "true"
457465
include.release.openshift.io/ibm-cloud-managed: "true"
458466
include.release.openshift.io/single-node-developer: "true"
467+
capability.openshift.io/name: Insights
459468
subjects:
460469
- kind: ServiceAccount
461470
name: operator

manifests/03-prometheus_role.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
99
include.release.openshift.io/single-node-developer: "true"
10+
capability.openshift.io/name: Insights
1011
rules:
1112
- apiGroups:
1213
- ""

manifests/03-prometheus_rolebinding.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
99
include.release.openshift.io/single-node-developer: "true"
10+
capability.openshift.io/name: Insights
1011
roleRef:
1112
apiGroup: rbac.authorization.k8s.io
1213
kind: Role

manifests/04-proxy-cert-configmap.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ metadata:
88
release.openshift.io/create-only: "true"
99
include.release.openshift.io/ibm-cloud-managed: "true"
1010
include.release.openshift.io/single-node-developer: "true"
11+
capability.openshift.io/name: Insights
1112
labels:
1213
config.openshift.io/inject-trusted-cabundle: "true"

manifests/04-service-ca-configmap.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ metadata:
99
service.beta.openshift.io/inject-cabundle: "true"
1010
include.release.openshift.io/ibm-cloud-managed: "true"
1111
include.release.openshift.io/single-node-developer: "true"
12+
capability.openshift.io/name: Insights

manifests/04-serviceaccount.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/ibm-cloud-managed: "true"
99
include.release.openshift.io/single-node-developer: "true"
10+
capability.openshift.io/name: Insights
1011
---
1112
apiVersion: v1
1213
kind: ServiceAccount
@@ -17,3 +18,4 @@ metadata:
1718
include.release.openshift.io/self-managed-high-availability: "true"
1819
include.release.openshift.io/ibm-cloud-managed: "true"
1920
include.release.openshift.io/single-node-developer: "true"
21+
capability.openshift.io/name: Insights

manifests/05-service.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
service.alpha.openshift.io/serving-cert-secret-name: openshift-insights-serving-cert
88
include.release.openshift.io/single-node-developer: "true"
99
include.release.openshift.io/ibm-cloud-managed: "true"
10+
capability.openshift.io/name: Insights
1011
labels:
1112
app: insights-operator
1213
name: metrics

manifests/06-deployment-ibm-cloud-managed.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
annotations:
66
config.openshift.io/inject-proxy: insights-operator
77
include.release.openshift.io/ibm-cloud-managed: "true"
8+
capability.openshift.io/name: Insights
89
name: insights-operator
910
namespace: openshift-insights
1011
spec:

manifests/06-deployment.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
exclude.release.openshift.io/internal-openshift-hosted: "true"
99
include.release.openshift.io/self-managed-high-availability: "true"
1010
include.release.openshift.io/single-node-developer: "true"
11+
capability.openshift.io/name: Insights
1112
spec:
1213
strategy:
1314
type: Recreate

manifests/07-cluster-operator.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ metadata:
77
include.release.openshift.io/self-managed-high-availability: "true"
88
include.release.openshift.io/single-node-developer: "true"
99
include.release.openshift.io/ibm-cloud-managed: "true"
10+
capability.openshift.io/name: Insights
1011
spec: {}
1112
status:
1213
versions:

manifests/07-servicemonitor.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ metadata:
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
1010
include.release.openshift.io/ibm-cloud-managed: "true"
11+
capability.openshift.io/name: Insights
1112
spec:
1213
endpoints:
1314
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token

manifests/08-prometheus_rule.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
include.release.openshift.io/self-managed-high-availability: "true"
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/single-node-developer: "true"
8+
capability.openshift.io/name: Insights
89
name: insights-prometheus-rules
910
namespace: openshift-insights
1011
spec:

0 commit comments

Comments
 (0)