add controller-id annotation to pods deployments and operator

Signed-off-by: Mario Fernandez <mariofer@redhat.com>
openshift · Apr 11, 2024 · 767cf61 · 767cf61
1 parent 9239b71
commit 767cf61
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -330,6 +330,9 @@ function(params)
         labels: {
           thanosRulerName: cfg.crName,
         },
+        annotations+: {
+          'operator.prometheus.io/controller-id': 'openshift-monitoring/prometheus-operator',
+        },
       },
       spec: {
         affinity: {