From 767cf61e5afe5cdc50a8107992c77a7468a6846d Mon Sep 17 00:00:00 2001 From: Mario Fernandez Date: Wed, 10 Apr 2024 11:57:49 +0200 Subject: [PATCH] add controller-id annotation to pods deployments and operator Signed-off-by: Mario Fernandez --- assets/alertmanager-user-workload/alertmanager.yaml | 2 ++ assets/alertmanager/alertmanager.yaml | 2 ++ assets/prometheus-k8s/prometheus.yaml | 2 ++ assets/prometheus-operator-user-workload/deployment.yaml | 1 + assets/prometheus-operator/deployment.yaml | 1 + assets/prometheus-user-workload/prometheus.yaml | 2 ++ assets/thanos-ruler/thanos-ruler.yaml | 2 ++ jsonnet/components/alertmanager-user-workload.libsonnet | 5 +++++ jsonnet/components/alertmanager.libsonnet | 5 +++++ .../components/prometheus-operator-user-workload.libsonnet | 1 + jsonnet/components/prometheus-operator.libsonnet | 1 + jsonnet/components/prometheus-user-workload.libsonnet | 5 +++++ jsonnet/components/prometheus.libsonnet | 5 +++++ jsonnet/components/thanos-ruler.libsonnet | 3 +++ 14 files changed, 37 insertions(+) diff --git a/assets/alertmanager-user-workload/alertmanager.yaml b/assets/alertmanager-user-workload/alertmanager.yaml index 9f6c060d8d..184aa0724d 100644 --- a/assets/alertmanager-user-workload/alertmanager.yaml +++ b/assets/alertmanager-user-workload/alertmanager.yaml @@ -1,6 +1,8 @@ apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: + annotations: + operator.prometheus.io/controller-id: openshift-user-workload-monitoring/prometheus-operator labels: app.kubernetes.io/component: alert-router app.kubernetes.io/instance: user-workload diff --git a/assets/alertmanager/alertmanager.yaml b/assets/alertmanager/alertmanager.yaml index 977899621a..0616b22ec8 100644 --- a/assets/alertmanager/alertmanager.yaml +++ b/assets/alertmanager/alertmanager.yaml @@ -1,6 +1,8 @@ apiVersion: monitoring.coreos.com/v1 kind: Alertmanager metadata: + annotations: + operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator labels: app.kubernetes.io/component: alert-router app.kubernetes.io/instance: main diff --git a/assets/prometheus-k8s/prometheus.yaml b/assets/prometheus-k8s/prometheus.yaml index 8aa14c1051..d70d841387 100644 --- a/assets/prometheus-k8s/prometheus.yaml +++ b/assets/prometheus-k8s/prometheus.yaml @@ -1,6 +1,8 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: + annotations: + operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator labels: app.kubernetes.io/component: prometheus app.kubernetes.io/instance: k8s diff --git a/assets/prometheus-operator-user-workload/deployment.yaml b/assets/prometheus-operator-user-workload/deployment.yaml index 7f57960da3..25fd34b50f 100644 --- a/assets/prometheus-operator-user-workload/deployment.yaml +++ b/assets/prometheus-operator-user-workload/deployment.yaml @@ -40,6 +40,7 @@ spec: - --config-reloader-cpu-request=1m - --config-reloader-memory-request=10Mi - --web.listen-address=127.0.0.1:8080 + - --controller-id=openshift-user-workload-monitoring/prometheus-operator env: - name: GOGC value: "30" diff --git a/assets/prometheus-operator/deployment.yaml b/assets/prometheus-operator/deployment.yaml index f781990583..cbc655ac45 100644 --- a/assets/prometheus-operator/deployment.yaml +++ b/assets/prometheus-operator/deployment.yaml @@ -41,6 +41,7 @@ spec: - --config-reloader-cpu-request=1m - --config-reloader-memory-request=10Mi - --web.listen-address=127.0.0.1:8080 + - --controller-id=openshift-monitoring/prometheus-operator env: - name: GOGC value: "30" diff --git a/assets/prometheus-user-workload/prometheus.yaml b/assets/prometheus-user-workload/prometheus.yaml index 4a0c6d7af7..79c7a702d4 100644 --- a/assets/prometheus-user-workload/prometheus.yaml +++ b/assets/prometheus-user-workload/prometheus.yaml @@ -1,6 +1,8 @@ apiVersion: monitoring.coreos.com/v1 kind: Prometheus metadata: + annotations: + operator.prometheus.io/controller-id: openshift-user-workload-monitoring/prometheus-operator labels: app.kubernetes.io/component: prometheus app.kubernetes.io/instance: user-workload diff --git a/assets/thanos-ruler/thanos-ruler.yaml b/assets/thanos-ruler/thanos-ruler.yaml index a554a3b72b..bc20ede0c3 100644 --- a/assets/thanos-ruler/thanos-ruler.yaml +++ b/assets/thanos-ruler/thanos-ruler.yaml @@ -1,6 +1,8 @@ apiVersion: monitoring.coreos.com/v1 kind: ThanosRuler metadata: + annotations: + operator.prometheus.io/controller-id: openshift-monitoring/prometheus-operator labels: app.kubernetes.io/managed-by: cluster-monitoring-operator app.kubernetes.io/part-of: openshift-monitoring diff --git a/jsonnet/components/alertmanager-user-workload.libsonnet b/jsonnet/components/alertmanager-user-workload.libsonnet index 63b6bee898..bb03bc2634 100644 --- a/jsonnet/components/alertmanager-user-workload.libsonnet +++ b/jsonnet/components/alertmanager-user-workload.libsonnet @@ -203,6 +203,11 @@ function(params) }, alertmanager+: { + metadata+: { + annotations+: { + 'operator.prometheus.io/controller-id': 'openshift-user-workload-monitoring/prometheus-operator', + }, + }, spec+: { securityContext: { fsGroup: 65534, diff --git a/jsonnet/components/alertmanager.libsonnet b/jsonnet/components/alertmanager.libsonnet index f67c2cfee1..18b1db1bf9 100644 --- a/jsonnet/components/alertmanager.libsonnet +++ b/jsonnet/components/alertmanager.libsonnet @@ -240,6 +240,11 @@ function(params) }, alertmanager+: { + metadata+: { + annotations+: { + 'operator.prometheus.io/controller-id': 'openshift-monitoring/prometheus-operator', + }, + }, spec+: { securityContext: { fsGroup: 65534, diff --git a/jsonnet/components/prometheus-operator-user-workload.libsonnet b/jsonnet/components/prometheus-operator-user-workload.libsonnet index 1138abd04a..ab1a188a0d 100644 --- a/jsonnet/components/prometheus-operator-user-workload.libsonnet +++ b/jsonnet/components/prometheus-operator-user-workload.libsonnet @@ -97,6 +97,7 @@ function(params) '--config-reloader-cpu-request=1m', '--config-reloader-memory-request=10Mi', '--web.listen-address=127.0.0.1:8080', + '--controller-id=openshift-user-workload-monitoring/prometheus-operator', ], ports: [], resources: { diff --git a/jsonnet/components/prometheus-operator.libsonnet b/jsonnet/components/prometheus-operator.libsonnet index a4b4aaff16..ce261ed29a 100644 --- a/jsonnet/components/prometheus-operator.libsonnet +++ b/jsonnet/components/prometheus-operator.libsonnet @@ -75,6 +75,7 @@ function(params) '--config-reloader-cpu-request=1m', '--config-reloader-memory-request=10Mi', '--web.listen-address=127.0.0.1:8080', + '--controller-id=openshift-monitoring/prometheus-operator', ], ports: [], resources: { diff --git a/jsonnet/components/prometheus-user-workload.libsonnet b/jsonnet/components/prometheus-user-workload.libsonnet index 9e247b3f91..397c6d0cd7 100644 --- a/jsonnet/components/prometheus-user-workload.libsonnet +++ b/jsonnet/components/prometheus-user-workload.libsonnet @@ -291,6 +291,11 @@ function(params) }, prometheus+: { + metadata+: { + annotations+: { + 'operator.prometheus.io/controller-id': 'openshift-user-workload-monitoring/prometheus-operator', + }, + }, spec+: { overrideHonorTimestamps: true, overrideHonorLabels: true, diff --git a/jsonnet/components/prometheus.libsonnet b/jsonnet/components/prometheus.libsonnet index 1cfb26eb90..7c7764ad2b 100644 --- a/jsonnet/components/prometheus.libsonnet +++ b/jsonnet/components/prometheus.libsonnet @@ -328,6 +328,11 @@ function(params) // TLS. Additionally as the Alertmanager is protected with TLS, authN and // authZ it requires some additonal configuration. prometheus+: { + metadata+: { + annotations+: { + 'operator.prometheus.io/controller-id': 'openshift-monitoring/prometheus-operator', + }, + }, spec+: { alerting+: { alertmanagers: diff --git a/jsonnet/components/thanos-ruler.libsonnet b/jsonnet/components/thanos-ruler.libsonnet index 6506e6c88d..dfe2dced46 100644 --- a/jsonnet/components/thanos-ruler.libsonnet +++ b/jsonnet/components/thanos-ruler.libsonnet @@ -330,6 +330,9 @@ function(params) labels: { thanosRulerName: cfg.crName, }, + annotations+: { + 'operator.prometheus.io/controller-id': 'openshift-monitoring/prometheus-operator', + }, }, spec: { affinity: {