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

Add podLabels variable for all daemonsets. #690

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
metadata:
labels:
{{- include "nvidia-device-plugin.templateLabels" . | nindent 8 }}
{{- toYaml .Values.podLabels | nindent 8 }}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A general question. What is the behaviour if these conflict with any labels generated from templateLabels?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should merge and keep the last stated label I believe.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if someone passed in a label the templateLabels variable sets, they will override it.

annotations:
{{- include "nvidia-device-plugin.podAnnotations" (dict "local" . "root" .) | nindent 8 }}
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ spec:
metadata:
labels:
{{- include "nvidia-device-plugin.templateLabels" . | nindent 8 }}
{{- toYaml .Values.podLabels | nindent 8 }}
annotations:
{{- include "nvidia-device-plugin.podAnnotations" (dict "local" . "root" .) | nindent 8 }}
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ spec:
metadata:
labels:
{{- include "nvidia-device-plugin.templateLabels" . | nindent 8 }}
{{- toYaml .Values.podLabels | nindent 8 }}
annotations:
{{- include "nvidia-device-plugin.podAnnotations" (dict "local" . "root" .) | nindent 8 }}
spec:
Expand Down
1 change: 1 addition & 0 deletions deployments/helm/nvidia-device-plugin/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ updateStrategy:
type: RollingUpdate

podAnnotations: {}
podLabels: {}
podSecurityContext: {}
securityContext: {}

Expand Down