Skip to content

Commit 366ad50

Browse files
committed
MON-4361: Annotate optional monitoring resources
Metric rules and metrics exporters have not been opted-in to keep the telemetry rules functioning. Optional components include: * Alertmanager * AlertmanagerUWM * ClusterMonitoringOperatorDeps (partially, for AM) * MonitoringPlugin * PromtheusOperator (partially, for AM) * PromtheusOperatorUWM * ThanosRuler Signed-off-by: Pranshu Srivastava <[email protected]>
1 parent 0142d3f commit 366ad50

File tree

103 files changed

+254
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+254
-31
lines changed

assets/admission-webhook/alertmanager-config-validating-webhook.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: admissionregistration.k8s.io/v1
22
kind: ValidatingWebhookConfiguration
33
metadata:
44
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
56
service.beta.openshift.io/inject-cabundle: "true"
67
labels:
78
app.kubernetes.io/component: controller

assets/alertmanager-user-workload/alertmanager.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: monitoring.coreos.com/v1
22
kind: Alertmanager
33
metadata:
44
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
56
operator.prometheus.io/controller-id: openshift-user-workload-monitoring/prometheus-operator
67
labels:
78
app.kubernetes.io/component: alert-router

assets/alertmanager-user-workload/cluster-role-binding.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRoleBinding
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/managed-by: cluster-monitoring-operator
68
app.kubernetes.io/part-of: openshift-monitoring

assets/alertmanager-user-workload/cluster-role.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: rbac.authorization.k8s.io/v1
22
kind: ClusterRole
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/managed-by: cluster-monitoring-operator
68
app.kubernetes.io/part-of: openshift-monitoring

assets/alertmanager-user-workload/kube-rbac-proxy-metric-secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: v1
22
data: {}
33
kind: Secret
44
metadata:
5+
annotations:
6+
capability.openshift.io/name: OptionalMonitoring
57
labels:
68
app.kubernetes.io/managed-by: cluster-monitoring-operator
79
app.kubernetes.io/name: alertmanager-user-workload

assets/alertmanager-user-workload/kube-rbac-proxy-secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: v1
22
kind: Secret
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/managed-by: cluster-monitoring-operator
68
app.kubernetes.io/name: alertmanager-user-workload

assets/alertmanager-user-workload/kube-rbac-proxy-tenancy-secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: v1
22
kind: Secret
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/managed-by: cluster-monitoring-operator
68
app.kubernetes.io/name: alertmanager-user-workload

assets/alertmanager-user-workload/pod-disruption-budget.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: policy/v1
22
kind: PodDisruptionBudget
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/component: alert-router
68
app.kubernetes.io/instance: user-workload

assets/alertmanager-user-workload/secret.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
apiVersion: v1
22
kind: Secret
33
metadata:
4+
annotations:
5+
capability.openshift.io/name: OptionalMonitoring
46
labels:
57
app.kubernetes.io/component: alert-router
68
app.kubernetes.io/instance: user-workload

assets/alertmanager-user-workload/service-account.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: v1
22
automountServiceAccountToken: false
33
kind: ServiceAccount
44
metadata:
5+
annotations:
6+
capability.openshift.io/name: OptionalMonitoring
57
labels:
68
app.kubernetes.io/component: alert-router
79
app.kubernetes.io/instance: user-workload

0 commit comments

Comments
 (0)