diff --git a/manifests/02-namespace.yaml b/manifests/02-namespace.yaml index 26b38daca..4cb951e90 100644 --- a/manifests/02-namespace.yaml +++ b/manifests/02-namespace.yaml @@ -8,6 +8,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" workload.openshift.io/allowed: "management" + capability.openshift.io/name: Insights labels: openshift.io/cluster-monitoring: "true" name: openshift-insights diff --git a/manifests/03-clusterrole.yaml b/manifests/03-clusterrole.yaml index 4a68ef84d..c31e04b56 100644 --- a/manifests/03-clusterrole.yaml +++ b/manifests/03-clusterrole.yaml @@ -6,6 +6,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: ClusterRole name: system:auth-delegator @@ -23,6 +24,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: Role name: extension-apiserver-authentication-reader @@ -31,7 +33,6 @@ subjects: namespace: openshift-insights name: operator --- - apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: @@ -40,6 +41,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: # allow the operator to update cluster operator status - apiGroups: @@ -74,7 +76,6 @@ rules: - namespaces verbs: - get - --- apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding @@ -85,6 +86,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: Role name: monitoring-alertmanager-edit @@ -92,9 +94,7 @@ subjects: - kind: ServiceAccount namespace: openshift-insights name: operator - --- - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -104,6 +104,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: ClusterRole name: insights-operator @@ -111,7 +112,6 @@ subjects: - kind: ServiceAccount namespace: openshift-insights name: operator - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -121,6 +121,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - "" @@ -272,6 +273,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: ClusterRole name: insights-operator-gather @@ -279,7 +281,6 @@ subjects: - kind: ServiceAccount namespace: openshift-insights name: gather - --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -289,6 +290,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: ClusterRole name: cluster-reader @@ -307,6 +309,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - "" @@ -328,6 +331,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: Role name: insights-operator @@ -335,7 +339,6 @@ subjects: - kind: ServiceAccount name: operator namespace: openshift-insights - --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role @@ -346,6 +349,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - "" @@ -371,6 +375,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: kind: Role name: insights-operator @@ -388,6 +393,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - '' @@ -410,6 +416,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights subjects: - kind: ServiceAccount name: operator @@ -427,6 +434,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - '' @@ -449,6 +457,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights subjects: - kind: ServiceAccount name: operator diff --git a/manifests/03-prometheus_role.yaml b/manifests/03-prometheus_role.yaml index 6da6574d3..51a5d35ff 100644 --- a/manifests/03-prometheus_role.yaml +++ b/manifests/03-prometheus_role.yaml @@ -7,6 +7,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights rules: - apiGroups: - "" diff --git a/manifests/03-prometheus_rolebinding.yaml b/manifests/03-prometheus_rolebinding.yaml index 51cc15bc5..ee242e5b4 100644 --- a/manifests/03-prometheus_rolebinding.yaml +++ b/manifests/03-prometheus_rolebinding.yaml @@ -7,6 +7,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights roleRef: apiGroup: rbac.authorization.k8s.io kind: Role diff --git a/manifests/04-proxy-cert-configmap.yaml b/manifests/04-proxy-cert-configmap.yaml index 2cbeb799b..97623c328 100644 --- a/manifests/04-proxy-cert-configmap.yaml +++ b/manifests/04-proxy-cert-configmap.yaml @@ -8,5 +8,6 @@ metadata: release.openshift.io/create-only: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights labels: config.openshift.io/inject-trusted-cabundle: "true" diff --git a/manifests/04-service-ca-configmap.yaml b/manifests/04-service-ca-configmap.yaml index ff7af7cc0..c762680b5 100644 --- a/manifests/04-service-ca-configmap.yaml +++ b/manifests/04-service-ca-configmap.yaml @@ -9,3 +9,4 @@ metadata: service.beta.openshift.io/inject-cabundle: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights diff --git a/manifests/04-serviceaccount.yaml b/manifests/04-serviceaccount.yaml index c48cd84ed..3be8f03c7 100644 --- a/manifests/04-serviceaccount.yaml +++ b/manifests/04-serviceaccount.yaml @@ -7,6 +7,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights --- apiVersion: v1 kind: ServiceAccount @@ -17,3 +18,4 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights diff --git a/manifests/05-service.yaml b/manifests/05-service.yaml index ce1d77597..fd9b1e195 100644 --- a/manifests/05-service.yaml +++ b/manifests/05-service.yaml @@ -7,6 +7,7 @@ metadata: service.alpha.openshift.io/serving-cert-secret-name: openshift-insights-serving-cert include.release.openshift.io/single-node-developer: "true" include.release.openshift.io/ibm-cloud-managed: "true" + capability.openshift.io/name: Insights labels: app: insights-operator name: metrics diff --git a/manifests/06-deployment-ibm-cloud-managed.yaml b/manifests/06-deployment-ibm-cloud-managed.yaml index 0dad9c4b5..667edc630 100644 --- a/manifests/06-deployment-ibm-cloud-managed.yaml +++ b/manifests/06-deployment-ibm-cloud-managed.yaml @@ -5,6 +5,7 @@ metadata: annotations: config.openshift.io/inject-proxy: insights-operator include.release.openshift.io/ibm-cloud-managed: "true" + capability.openshift.io/name: Insights name: insights-operator namespace: openshift-insights spec: diff --git a/manifests/06-deployment.yaml b/manifests/06-deployment.yaml index 2fe72b487..3c9fd1690 100644 --- a/manifests/06-deployment.yaml +++ b/manifests/06-deployment.yaml @@ -8,6 +8,7 @@ metadata: exclude.release.openshift.io/internal-openshift-hosted: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights spec: strategy: type: Recreate diff --git a/manifests/07-cluster-operator.yaml b/manifests/07-cluster-operator.yaml index 0205aca06..a8e740aaf 100644 --- a/manifests/07-cluster-operator.yaml +++ b/manifests/07-cluster-operator.yaml @@ -7,6 +7,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" include.release.openshift.io/ibm-cloud-managed: "true" + capability.openshift.io/name: Insights spec: {} status: versions: diff --git a/manifests/07-servicemonitor.yaml b/manifests/07-servicemonitor.yaml index df8c45bf9..3e6ef98d4 100644 --- a/manifests/07-servicemonitor.yaml +++ b/manifests/07-servicemonitor.yaml @@ -8,6 +8,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" include.release.openshift.io/ibm-cloud-managed: "true" + capability.openshift.io/name: Insights spec: endpoints: - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token diff --git a/manifests/08-prometheus_rule.yaml b/manifests/08-prometheus_rule.yaml index 0e1d8c519..5c1c7cc86 100644 --- a/manifests/08-prometheus_rule.yaml +++ b/manifests/08-prometheus_rule.yaml @@ -5,6 +5,7 @@ metadata: include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/single-node-developer: "true" + capability.openshift.io/name: Insights name: insights-prometheus-rules namespace: openshift-insights spec: