Merge branch 'helm2' into 'master'

Restore helm chart to working state See merge request nvidia/container-toolkit/gpu-monitoring-tools!29
tkestack · Aug 3, 2020 · 1bbc5cd · 1bbc5cd
2 parents ab69858 + 751ee7c
commit 1bbc5cd
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 35 deletions.
diff --git a/deployment/dcgm-exporter/Chart.yaml b/deployment/dcgm-exporter/Chart.yaml
@@ -1,7 +1,8 @@
-apiVersion: v2
+apiVersion: v1
 name: dcgm-exporter
-description: A Helm chart for Kubernetes
-type: application
-version: "1.0.1"
+description: A Helm chart for DCGM exporter
+sources:
+- https://gitlab.com/nvidia/container-toolkit/gpu-monitoring-tools
+version: "1.0.2"
 appVersion: "1.7.2"
 kubeVersion: ">= 1.13.0"
diff --git a/deployment/dcgm-exporter/templates/daemonset.yaml b/deployment/dcgm-exporter/templates/daemonset.yaml
@@ -16,19 +16,10 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"
-spec:
-  updateStrategy:
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      {{- include "dcgm-exporter.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: "dcgm-exporter"
 spec:
   updateStrategy:
     type: RollingUpdate

diff --git a/deployment/dcgm-exporter/templates/service-monitor.yaml b/deployment/dcgm-exporter/templates/service-monitor.yaml
@@ -17,9 +17,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.serviceMonitor.namespace }}
-  namespace: {{ .Values.serviceMonitor.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"
@@ -31,16 +29,9 @@ spec:
     matchLabels:
       {{- include "dcgm-exporter.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: "dcgm-exporter"
-  endpoints:
-  - port: "metrics"
-    path: "/metrics"
   namespaceSelector:
     matchNames:
-{{- if .Values.namespace }}
-    - "{{ .Values.namespace }}"
-{{ else }}
     - "{{ .Release.Namespace }}"
-{{- end }}
   endpoints:
   - port: "metrics"
     path: "/metrics"

diff --git a/deployment/dcgm-exporter/templates/service.yaml b/deployment/dcgm-exporter/templates/service.yaml
@@ -16,12 +16,14 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "dcgm-exporter.fullname" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"
+  {{- with .Values.service.annotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/deployment/dcgm-exporter/templates/serviceaccount.yaml b/deployment/dcgm-exporter/templates/serviceaccount.yaml
@@ -3,9 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "dcgm-exporter.serviceAccountName" . }}
-{{- if .Values.namespace }}
-  namespace: {{ .Values.namespace }}
-{{- end }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "dcgm-exporter.labels" . | nindent 4 }}
     app.kubernetes.io/component: "dcgm-exporter"

diff --git a/deployment/dcgm-exporter/values.yaml b/deployment/dcgm-exporter/values.yaml
@@ -19,9 +19,6 @@ image:
   # for the image tag, e.g:
   #tag: 1.7.2
 
-# For helm v2 this field might be useful
-#namespace: kube-system
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -50,6 +47,8 @@ service:
   type: ClusterIP
   port: 9400
   address: ":9400"
+  # Annotations to add to the service
+  annotations: {}
 
 resources: {}
   # limits:
@@ -61,8 +60,6 @@ resources: {}
 serviceMonitor:
   enabled: true
   interval: 15s
-  # Defaults to .Release.Namespace
-  #namespace: default
   additionalLabels: {}
     #monitoring: prometheus