1, karma ipFamilies 2, dcgm-exporter fix dashboard

Signed-off-by: youjian <youjian@cmss.chinamobile.com> Signed-off-by: yogiseven <seventhyou@126.com>
kubeservice-stack · Jan 3, 2024 · befdf30 · befdf30
1 parent d813f08
commit befdf30
Show file tree

Hide file tree

Showing 5 changed files with 253 additions and 202 deletions.
diff --git a/metrics/charts/dcgm-exporter/templates/daemonset.yaml b/metrics/charts/dcgm-exporter/templates/daemonset.yaml
@@ -76,7 +76,7 @@ spec:
       {{- toYaml . | nindent 6 }}
       {{- end }}
       containers:
-      - name: exporter
+      - name: dcgm-exporter
         securityContext:
           {{- toYaml .Values.securityContext | nindent 10 }}
         {{- if .Values.image.tag }}

diff --git a/metrics/charts/dcgm-exporter/templates/service-monitor.yaml b/metrics/charts/dcgm-exporter/templates/service-monitor.yaml
@@ -21,6 +21,7 @@ metadata:
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"
+    release: metrics
     {{- if .Values.serviceMonitor.additionalLabels }}
     {{- toYaml .Values.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}

diff --git a/metrics/charts/karma/templates/service.yaml b/metrics/charts/karma/templates/service.yaml
@@ -14,6 +14,11 @@ metadata:
   annotations:
 {{ toYaml .Values.service.annotations | indent 4 }}
 spec:
+{{- if ge (.Capabilities.KubeVersion.Minor|int) 20 }}
+  ipFamilies:
+{{ toYaml .Values.service.ipFamilies | indent 2 }}
+  ipFamilyPolicy: {{ .Values.service.ipFamilyPolicy }}
+{{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}