Skip to content

[release-0.18] Always use dedicated service account in device-plugin helm chart #1803

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.

Sign up for GitHub

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

Closed
github-actions wants to merge 1 commit into from
Closed

[release-0.18] Always use dedicated service account in device-plugin helm chart #1803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions deployments/helm/nvidia-device-plugin/templates/daemonset-device-plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
{{- if .Values.devicePlugin.enabled }}
---
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}
{{- $useServiceAccount := $options.hasConfigMap }}
{{- $configMapName := (include "nvidia-device-plugin.configMapName" .) | trim }}
{{- $daemonsetName := printf "%s" (include "nvidia-device-plugin.fullname" .) | trunc 63 | trimSuffix "-" }}
apiVersion: apps/v1
Expand Down Expand Up @@ -52,9 +51,7 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if $useServiceAccount }}
serviceAccountName: {{ include "nvidia-device-plugin.fullname" . }}-service-account
{{- end }}
{{- if $options.hasConfigMap }}
shareProcessNamespace: true
initContainers:
Expand Down
5 changes: 3 additions & 2 deletions deployments/helm/nvidia-device-plugin/templates/daemonset-gfd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
{{- if .Values.gfd.enabled }}
---
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}
<<<<<<< HEAD
{{- $useServiceAccount := or ( $options.hasConfigMap ) ( and .Values.gfd.enabled .Values.nfd.enableNodeFeatureApi ) }}
=======
>>>>>>> 81a0e5e8f (Always use dedicated service account in device-plugin helm chart)
{{- $configMapName := (include "nvidia-device-plugin.configMapName" .) | trim }}
{{- $daemonsetName := printf "%s-gpu-feature-discovery" (include "nvidia-device-plugin.fullname" .) | trunc 63 | trimSuffix "-" }}
apiVersion: apps/v1
Expand Down Expand Up @@ -52,9 +55,7 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if $useServiceAccount }}
serviceAccountName: {{ include "nvidia-device-plugin.fullname" . }}-service-account
{{- end }}
{{- if $options.hasConfigMap }}
shareProcessNamespace: true
{{- end }}
Expand Down
2 changes: 0 additions & 2 deletions deployments/helm/nvidia-device-plugin/templates/daemonset-mps-control-daemon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,10 @@ spec:
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
{{- if $options.hasConfigMap }}
serviceAccountName: {{ include "nvidia-device-plugin.fullname" . }}-service-account
{{- if not .Values.mps.enableHostPID }}
shareProcessNamespace: true
{{- end }}
{{- end }}
{{- if .Values.mps.enableHostPID }}
hostPID: true
{{- end }}
Expand Down
4 changes: 3 additions & 1 deletion deployments/helm/nvidia-device-plugin/templates/role-binding.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
<<<<<<< HEAD
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}
{{- if or $options.hasConfigMap ( and .Values.gfd.enabled .Values.nfd.enableNodeFeatureApi ) }}
=======
>>>>>>> 81a0e5e8f (Always use dedicated service account in device-plugin helm chart)
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -15,4 +18,3 @@ roleRef:
kind: ClusterRole
name: {{ include "nvidia-device-plugin.fullname" . }}-role
apiGroup: rbac.authorization.k8s.io
{{- end }}
4 changes: 3 additions & 1 deletion deployments/helm/nvidia-device-plugin/templates/role.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
<<<<<<< HEAD
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}
{{- if or $options.hasConfigMap ( and .Values.gfd.enabled .Values.nfd.enableNodeFeatureApi ) }}
=======
>>>>>>> 81a0e5e8f (Always use dedicated service account in device-plugin helm chart)
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
Expand All @@ -16,4 +19,3 @@ rules:
resources: ["nodefeatures"]
verbs: ["get", "list", "watch", "create", "update"]
{{- end }}
{{- end }}
4 changes: 3 additions & 1 deletion deployments/helm/nvidia-device-plugin/templates/service-account.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
---
<<<<<<< HEAD
{{- $options := (include "nvidia-device-plugin.options" . | fromJson) }}
{{- if or $options.hasConfigMap ( and .Values.gfd.enabled .Values.nfd.enableNodeFeatureApi ) }}
=======
>>>>>>> 81a0e5e8f (Always use dedicated service account in device-plugin helm chart)
apiVersion: v1
kind: ServiceAccount
metadata:
name: {{ include "nvidia-device-plugin.fullname" . }}-service-account
namespace: {{ include "nvidia-device-plugin.namespace" . }}
labels:
{{- include "nvidia-device-plugin.labels" . | nindent 4 }}
{{- end }}