Use per-component matchLabels selector in pod specs (fix #355)

Signed-off-by: Dr. Jan-Philip Gehrcke <[email protected]>

Author: jgehrcke

deployments/helm/nvidia-dra-driver-gpu/templates/_helpers.tpl

@@ -66,14 +66,19 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
-Selector labels
+Selector labels: meant to select just the pods of the corresponding
+deployment/daemonset/... That is, this is different per-component.
 */}}
 {{- define "nvidia-dra-driver-gpu.selectorLabels" -}}
-{{- if .Values.selectorLabelsOverride -}}
-{{ toYaml .Values.selectorLabelsOverride }}
-{{- else -}}
-{{ include "nvidia-dra-driver-gpu.templateLabels" . }}
-{{- end }}
+  {{- if and (hasKey . "componentName") (hasKey . "context") -}}
+    {{- if .context.Values.selectorLabelsOverride -}}
+    {{ toYaml .context.Values.selectorLabelsOverride }}
+    {{- else -}}
+    nvidia-dra-driver-gpu-component: {{ .componentName }}
+    {{- end }}
+  {{- else -}}
+  fail "selectorLabels: both arguments are required: context, componentName"
+  {{- end }}
 {{- end }}
 
 {{/*

deployments/helm/nvidia-dra-driver-gpu/templates/controller.yaml

@@ -25,7 +25,7 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      {{- include "nvidia-dra-driver-gpu.selectorLabels" . | nindent 6 }}
+      {{- include "nvidia-dra-driver-gpu.selectorLabels" (dict "context" . "componentName" "controller") | nindent 6 }}
   template:
     metadata:
       {{- with .Values.controller.podAnnotations }}
@@ -34,6 +34,7 @@ spec:
       {{- end }}
       labels:
         {{- include "nvidia-dra-driver-gpu.templateLabels" . | nindent 8 }}
+        {{- include "nvidia-dra-driver-gpu.selectorLabels" (dict "context" . "componentName" "controller") | nindent 8 }}
     spec:
       {{- if .Values.controller.priorityClassName }}
       priorityClassName: {{ .Values.controller.priorityClassName }}

deployments/helm/nvidia-dra-driver-gpu/templates/kubeletplugin.yaml

@@ -24,7 +24,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      {{- include "nvidia-dra-driver-gpu.selectorLabels" . | nindent 6 }}
+      {{- include "nvidia-dra-driver-gpu.selectorLabels" (dict "context" . "componentName" "kubelet-plugin") | nindent 6 }}
   {{- with .Values.kubeletPlugin.updateStrategy }}
   updateStrategy:
     {{- toYaml . | nindent 4 }}
@@ -37,6 +37,7 @@ spec:
       {{- end }}
       labels:
         {{- include "nvidia-dra-driver-gpu.templateLabels" . | nindent 8 }}
+        {{- include "nvidia-dra-driver-gpu.selectorLabels" (dict "context" . "componentName" "kubelet-plugin") | nindent 8 }}
     spec:
       {{- if .Values.kubeletPlugin.priorityClassName }}
       priorityClassName: {{ .Values.kubeletPlugin.priorityClassName }}