Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nvidia] fix: use nindent correctly and correct values file #370

Merged
merged 2 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion staging/nvidia/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Nvidia GPU driver and device plugin for running Nvidia GPU
keywords:
- gpu
- nvidia
version: 0.3.0
version: 0.3.1
appVersion: "0.2.0"
home: http://github.com/mesosphere/charts/staging
sources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ spec:
labels:
name: {{ template "nvidia-dcgm-exporter.fullname" . }}
spec:
{{- if .Values.initContainers }}
initContainers:
{{- toYaml .Values.initContainers | nindent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{- toYaml .Values.tolerations | indent 8 }}
{{- toYaml .Values.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{- toYaml .Values.nodeSelector | indent 8 }}
{{- toYaml .Values.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
initContainers:
{{- toYaml .Values.initContainers | nindent 8 }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
Expand All @@ -33,7 +33,7 @@ spec:
imagePullPolicy: {{ .Values.podNvidiaGpuMetricsExporter.image.pullPolicy }}
{{- if .Values.podNvidiaGpuMetricsExporter.resources }}
resources:
{{ toYaml .Values.podNvidiaGpuMetricsExporter.resources | indent 12 }}
{{- toYaml .Values.podNvidiaGpuMetricsExporter.resources | nindent 12 }}
{{- end }}
ports:
- name: gpu-metrics
Expand All @@ -54,7 +54,7 @@ spec:
imagePullPolicy: {{ .Values.nvidiaDcgmExporter.image.pullPolicy }}
{{- if .Values.nvidiaDcgmExporter.resources }}
resources:
{{- toYaml .Values.nvidiaDcgmExporter.resources | indent 12 }}
{{- toYaml .Values.nvidiaDcgmExporter.resources | nindent 12 }}
{{- end }}
securityContext:
runAsNonRoot: false
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,17 @@ spec:
labels:
name: {{ template "nvidia-device-plugin.fullname" . }}
spec:
{{- if .Values.tolerations }}
tolerations:
{{- toYaml .Values.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{- toYaml .Values.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
initContainers:
{{- toYaml .Values.initContainers | nindent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{- toYaml .Values.tolerations | indent 8 }}
{{- end }}
priorityClassName: {{ .Values.priorityClassName }}
containers:
Expand All @@ -33,15 +37,11 @@ spec:
drop: ["ALL"]
{{- if .Values.resources }}
resources:
{{- toYaml .Values.resources | indent 12 }}
{{- toYaml .Values.resources | nindent 12 }}
{{- end }}
volumeMounts:
- name: device-plugin
mountPath: /var/lib/kubelet/device-plugins
{{- if .Values.nodeSelector }}
nodeSelector:
{{- toYaml .Values.nodeSelector | indent 8 }}
{{- end }}
volumes:
- name: device-plugin
hostPath:
Expand Down

This file was deleted.

12 changes: 6 additions & 6 deletions staging/nvidia/charts/nvidia-driver/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ spec:
labels:
name: {{ template "nvidia-driver.fullname" . }}
spec:
{{- if .Values.tolerations }}
tolerations:
{{- toYaml .Values.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.nodeSelector }}
nodeSelector:
{{- toYaml .Values.nodeSelector | indent 8 }}
{{- toYaml .Values.nodeSelector | nindent 8 }}
{{- end }}
{{- if .Values.initContainers }}
initContainers:
{{- toYaml .Values.initContainers | nindent 8 }}
{{- end }}
{{- if .Values.tolerations }}
tolerations:
{{- toYaml .Values.tolerations | indent 8 }}
{{- end }}
priorityClassName: {{ .Values.priorityClassName }}
hostPID: true
Expand All @@ -35,7 +35,7 @@ spec:
privileged: true
{{- if .Values.resources }}
resources:
{{- toYaml .Values.resources | indent 12 }}
{{- toYaml .Values.resources | nindent 12 }}
{{- end }}
volumeMounts:
- name: update-driver
Expand Down

This file was deleted.

5 changes: 4 additions & 1 deletion staging/nvidia/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ grafana:

nvidia-dcgm-exporter:
enabled: true
resources: {}
podNvidiaGpuMetricsExporter:
resources: {}
nvidiaDcgmExporter:
resources: {}
nodeSelector: {}
tolerations: []
initContainers: []
Expand Down