chore(chart): add scheduler and controller-manager prometheus crape a…

…nnotations
volcano-sh · Dec 24, 2024 · 4178bcd · 4178bcd
1 parent 0966fd5
commit 4178bcd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/installer/helm/chart/volcano/templates/controllers.yaml b/installer/helm/chart/volcano/templates/controllers.yaml
@@ -125,6 +125,10 @@ spec:
         {{- if or (.Values.custom.controller_podLabels) (.Values.custom.common_labels) }}
         {{- mustMerge (.Values.custom.controller_podLabels | default (dict)) (.Values.custom.common_labels | default (dict)) | toYaml | nindent 8 }}
         {{- end }}
+      annotations:
+        {{- if or (.Values.custom.controller_podAnnotations) (.Values.custom.common_annotations) }}
+        {{- mustMerge (.Values.custom.controller_podAnnotations | default (dict)) (.Values.custom.common_annotations | default (dict)) | toYaml | nindent 8 }}
+        {{- end }}
     spec:
       {{- if $controller_tolerations }}
       tolerations: {{- toYaml $controller_tolerations | nindent 8 }}

diff --git a/installer/helm/chart/volcano/templates/scheduler.yaml b/installer/helm/chart/volcano/templates/scheduler.yaml
@@ -147,6 +147,10 @@ spec:
         {{- if or (.Values.custom.scheduler_podLabels) (.Values.custom.common_labels) }}
         {{- mustMerge (.Values.custom.scheduler_podLabels | default (dict)) (.Values.custom.common_labels | default (dict)) | toYaml | nindent 8 }}
         {{- end }}
+      annotations:
+        {{- if or (.Values.custom.scheduler_podAnnotations) (.Values.custom.common_annotations) }}
+        {{- mustMerge (.Values.custom.scheduler_podAnnotations | default (dict)) (.Values.custom.common_annotations | default (dict)) | toYaml | nindent 8 }}
+        {{- end }}
     spec:
       {{- if $scheduler_tolerations }}
       tolerations: {{- toYaml $scheduler_tolerations | nindent 8 }}

diff --git a/installer/helm/chart/volcano/values.yaml b/installer/helm/chart/volcano/values.yaml
@@ -126,9 +126,19 @@ custom:
   admission_labels: ~
   scheduler_labels: ~
   controller_labels: ~
+  admission_podAnnotations: ~
+  scheduler_podAnnotations: 
+    prometheus.io/scrape: 'true'
+    prometheus.io/path: '/metrics'
+    prometheus.io/port: '8080'
+  controller_podAnnotations:
+    prometheus.io/scrape: 'true'
+    prometheus.io/path: '/metrics'
+    prometheus.io/port: '8081'  
 
 # Specify labels for all Volcano helm chart objects except for CRDs
   common_labels: ~
+  common_annotations: ~
 
 
 # Specify resources for Volcano main component deployments and pods