feat(helm-charts): Add commonPodAnnotations to allow Prometheus scrapping

Signed-off-by: hayk96 <hayko5999@gmail.com>

Author: hayk96

charts/kubebridge/README.md

@@ -5,13 +5,14 @@ This document provides a reference for the configurable values in the `values.ya
 ## Parameters
 ### Global parameters
 
-| Name                      | Type   | Value               | Description                                                                        |
-|---------------------------|--------|---------------------|------------------------------------------------------------------------------------|
-| `global.logLevel`         | string | `info`              | The log level for all KubeBridge components.                                       |
-| `global.nameOverride`     | string | `""`                | Partially override common.names.fullname template (will maintain the release name) |
-| `global.fullnameOverride` | string | `""`                | Fully override common.names.fullname template.                                     |
-| `global.image.repository` | string | `hayk96/kubebridge` | The Docker image repository.                                                       |
-| `global.image.tag`        | string | `v0.1.0`     | The Docker image tag.                                                              |
+| Name                          | Type   | Value               | Description                                                                        |
+|-------------------------------|--------|---------------------|------------------------------------------------------------------------------------|
+| `global.logLevel`             | string | `info`              | The log level for all KubeBridge components.                                       |
+| `global.nameOverride`         | string | `""`                | Partially override common.names.fullname template (will maintain the release name) |
+| `global.fullnameOverride`     | string | `""`                | Fully override common.names.fullname template.                                     |
+| `global.commonPodAnnotations` | object | See `values.yaml`   | Add annotations to pods of Sync and DNS components                                 |
+| `global.image.repository`     | string | `hayk96/kubebridge` | The Docker image repository.                                                       |
+| `global.image.tag`            | string | `v0.1.0`            | The Docker image tag.                                                              |
 
 ### Sync parameters
 

charts/kubebridge/templates/dns-deployment.yaml

@@ -18,10 +18,17 @@ spec:
       app: {{ include "kubebridge.fullname" . }}-dns
   template:
     metadata:
-      {{- with .Values.dns.podAnnotations }}
+      {{- if or .Values.global.commonPodAnnotations .Values.dns.podAnnotations }}
       annotations:
+      {{- with .Values.global.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.dns.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      annotations: {}
+      {{- end }}
       labels:
         {{- include "kubebridge.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: dns

charts/kubebridge/templates/sync-deployment.yaml

@@ -18,10 +18,17 @@ spec:
       app: {{ include "kubebridge.fullname" . }}-sync
   template:
     metadata:
-      {{- with .Values.sync.podAnnotations }}
+      {{- if or .Values.global.commonPodAnnotations .Values.sync.podAnnotations }}
       annotations:
+      {{- with .Values.global.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.sync.podAnnotations }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- else }}
+      annotations: {}
+      {{- end }}
       labels:
         {{- include "kubebridge.selectorLabels" . | nindent 8 }}
         app.kubernetes.io/component: sync

charts/kubebridge/values.yaml

@@ -5,6 +5,9 @@ global:
   logLevel: info
   nameOverride: ""
   fullnameOverride: ""
+  commonPodAnnotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "8080"
 
   image:
     repository: hayk96/kubebridge

requirements.txt

@@ -1,4 +1,3 @@
-prometheus-fastapi-instrumentator==7.1.0
 prometheus-client==0.22.0
 python-json-logger==2.0.7
 kubernetes==32.0.1